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.

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

polkit: Don't build elogind on non-Linux. #73837

Merged
merged 1 commit into from Nov 20, 2019
Merged

polkit: Don't build elogind on non-Linux. #73837

merged 1 commit into from Nov 20, 2019

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Nov 20, 2019

Motivation for this change

In #72057 I added support for elogind when systemd is not supported,
but it occurred to me that it probably doens't make sense to have
either of systemd or elogind on Darwin.

See #72057 (comment).

Things done
  • 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.
Notify maintainers

@worldofpeace

This was referenced Nov 20, 2019
Merged
Merged
@nh2
Copy link
Contributor Author

nh2 commented Nov 20, 2019

Can somebody ofborg-build that for me on Darwin?

@jtojnar
Copy link
Contributor

jtojnar commented Nov 20, 2019

@GrahamcOfBorg build polkit

jtojnar
jtojnar requested changes Nov 20, 2019
View reviewed changes
pkgs/development/libraries/polkit/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/polkit/default.nix Outdated Show resolved Hide resolved
@nh2
polkit: Don't build elogind on non-Linux.
504199e 
In NixOS#72057 I added support for elogind when systemd is not supported,
but it occurred to me that it probably doens't make sense to have
either of systemd or elogind on Darwin.
@nh2
Copy link
Contributor Author

nh2 commented Nov 20, 2019

@jtojnar Thanks for spotting this; I've force-pushed.

@jtojnar
Copy link
Contributor

jtojnar commented Nov 20, 2019

@GrahamcOfBorg build polkit

@nh2
Copy link
Contributor Author

nh2 commented Nov 20, 2019

OK, looks like the Darwin still fails to evaluate as much as on #60922 (commit 1ca49b8), so while polkit doesn't build on Darwin more or less than it did there, I have at least restored the same way it depended on systemd on Darwin as before my change.

Good to merge from my side.

@jtojnar jtojnar merged commit e75c718 into NixOS:master Nov 20, 2019
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

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@nh2 @jtojnar