-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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
autoPatchelfHook: add keep_libc flag #332617
Conversation
This will break systemd initrd, which relies on leaving |
- Add keep_libc flag to disable the default libc handling. Intended to be used by systemd. - Add autoPatchelfFlags to autoPatchelfHook for passing arguments to the autoPatchelf script This reverts part of the change made in NixOS#307068 / 80be926. Fixes NixOS#332533
Updated to accommodate systemd's requirement for different libc handling. |
Fixes #333710 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Other than updating the comment, this looks good to me. I think we can take it out of draft and once the comment is updated we can merge.
elif is_libc and not keep_libc: | ||
was_found = True | ||
break |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add to the comment above to include this condition?
Added some new comments and adjusted the flag description. I tried to make it easier to understand. Feel free to suggest new language if anything comes to mind. |
@squalus Well, originally, that comment was written to have one numbered bullet point for each of the conditions; the idea being to explain step by step what the loop is doing. So I would have preferred adding another bullet point and clarifying why each of the two libc steps is where it is in the process. Maybe something more like this?
I dunno. Your call. Whatever you're most happy with is good with me. Just wanted to offer an explanation for why the bullet points were listed that way. |
@ElvishJerricco Updated to use your suggested language. I think that's more clear. Much appreciated. |
Thanks @squalus! I did a squash merge just to get those comment tweaks all into the one commit. |
Description of changes
This reverts part of the change made in #307068 / 80be926.
Fixes #332533
Relevant: #325126
cc @ElvishJerricco @layus
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-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.