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

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

Merged
merged 1 commit into from Nov 20, 2019

Conversation

@nh2
Copy link
Contributor

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

@nh2 nh2 requested a review from worldofpeace Nov 20, 2019
@nh2

This comment has been minimized.

Copy link
Contributor Author

nh2 commented Nov 20, 2019

Can somebody ofborg-build that for me on Darwin?

@jtojnar

This comment has been minimized.

Copy link
Contributor

jtojnar commented Nov 20, 2019

@GrahamcOfBorg build polkit

pkgs/development/libraries/polkit/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/polkit/default.nix Outdated Show resolved Hide resolved
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.
@nh2 nh2 force-pushed the nh2:polkit-darwin-no-systemd branch from 9e0779a to 504199e Nov 20, 2019
@nh2

This comment has been minimized.

Copy link
Contributor Author

nh2 commented Nov 20, 2019

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

@jtojnar

This comment has been minimized.

Copy link
Contributor

jtojnar commented Nov 20, 2019

@GrahamcOfBorg build polkit

@nh2

This comment has been minimized.

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
16 checks passed
16 checks passed
polkit on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
polkit on aarch64-linux Success
Details
polkit on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.