polkit: fix building with useSystemd = false#393045
Merged
alyssais merged 1 commit intoNixOS:stagingfrom Mar 28, 2025
Merged
Conversation
github-actions
bot
added
10.rebuild-darwin: 1-10
alyssais
force-pushed
the
polkit-elogind
branch
from
bec0a61 to
dfba869
Compare
jtojnar
reviewed
Mar 25, 2025
pkgs/by-name/po/polkit/package.nix
Outdated
Member
There was a problem hiding this comment.
With people merging stuff from r-ryantm without proper review of upstream changes, I am a bit paranoid. I think I would prefer more explicit
Suggested change
| mv "$DESTDIR/usr/lib"/* "$out/lib" | |
| mkdir "$out/lib" | |
| mv "$DESTDIR/usr/lib/"{sysusers,tmpfiles}".d" "$out/lib" |
to reduce the chance of new hardcoded artifact slipping through our fingers. The third one can be set by -Dsystemdsystemunitdir.
Or maybe we could convince upstream to add options for the .d as well.
Member
Author
There was a problem hiding this comment.
How's that?
Or maybe we could convince upstream to add options for the
.das well.
It was hard enough to stop there being a hard dependency on systemd.pc. Given that we need to have this moving mechanism for other stuff anyway, I don't think it's worth it.
The PKG_CONFIG_* environment variables are only read from when systemd.pc is found. This meant that the ! test -e "$DESTDIR" check would fail when built without systemd. Avoid that by handling the systemd files unconditionally installed in lib the same way we do for etc.
alyssais
force-pushed
the
polkit-elogind
branch
from
dfba869 to
f55c3ee
Compare
wegank
added
12.approvals: 1
Contributor
|
Bisect says 12f68bf |
Member
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.