Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

accountsservice: fix vendor extensions #72400

Merged
merged 1 commit into from
Nov 1, 2019
Merged

accountsservice: fix vendor extensions #72400

merged 1 commit into from
Nov 1, 2019

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

Fixes #72396.

The interface org.freedesktop.DisplayManager.AccountsService
should now exist. This also actually fixes #45059.

Things done

I tested that before in a vm, I'd see the message in the lightdm.log like

WARNING: Error updating user /org/freedesktop/Accounts/User1000: GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: No such interface “org.freedesktop.DisplayManager.AccountsService”

and systemctl status accounts-daemon would have the warning

Found accounts service vendor extension symlink /nix/store/vp9g8f3467sf8s18v8aahmfkghpf6l3k-system-path/share/accountsservice/interfaces/org.freedesktop.DisplayManager.AccountsService.xml, but it must be exactly equal to '../../dbus-1/interfaces/org.freedesktop.DisplayManager.AccountsService.xml' for forwards-compatibility reasons.

With this patch these are no longer present.

I also tested similarly with #69052 that

  1. switching time to AM/PM in switchboard-plug-datetime
  2. time in wingpanel-indicator-datetime became AM/PM
  3. time in elementary greeter became AM/PM

and before this change changing time_format in switchboard-plug-datetime had no effects
to wingpanel-indicator-datetime or elementary-greeter.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@worldofpeace
accountsservice: fix vendor extensions
feda399 
Fixes NixOS#72396.

The interface org.freedesktop.DisplayManager.AccountsService
should now exist. This also actually fixes NixOS#45059.
jtojnar
jtojnar approved these changes Nov 1, 2019
View reviewed changes
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Personally, I would drop even the symlink check but since everything is a symlink in NixOS, it probably does not make sense.

@ofborg ofborg bot requested a review from pSub November 1, 2019 01:21
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 11-100 labels Nov 1, 2019
@worldofpeace worldofpeace merged commit 021a5cc into NixOS:master Nov 1, 2019
@worldofpeace worldofpeace deleted the fix/accountsservice branch November 1, 2019 13:05
@worldofpeace
Copy link
Contributor Author

I think I can backport this one too.

@worldofpeace worldofpeace mentioned this pull request Nov 3, 2019
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar approved these changes

@pSub pSub Awaiting requested review from pSub

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
2 participants
@worldofpeace @jtojnar