autoPatchelfHook: move multiline hook into a function #295099
Merged
Conversation
This file contains 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
|
cc @philiptaron, since you were interested in this. |
philiptaron
reviewed
Mar 11, 2024
In NixOS#290081 it came to attention that autoPatchelfHook is one of if not the only hook in Nixpkgs that is a multiline string expression. Almost all hooks are functions, which guard with something like `if [ -z "${dontDoTheThing-}" ]; then ...` in the function, or single-line strings which include that guard inline and then call the real function, e.g. `if [ -z "${dontDoTheThing-} ]; then doTheThing; fi`. This commit moves autoPatchelfHook to the former, which seems to be the most common style now.
Qyriad
force-pushed
the
maint/autopatchelf-single-line
branch
from
3ed4aa6 to
2ad2295
Compare
|
Thanks @philiptaron; fixed those up now! |
|
Changing the PR base went smoothly. This is a trivial change (but a mass rebuild nonetheless). Merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In NixOS/nixpkgs#290081 stdenv: log hooks as they run it came to attention that autoPatchelfHook is one of if not the only hook in Nixpkgs that is a multiline string expression. Almost all hooks are functions, which guard with something like
if [ -z "${dontDoTheThing-}" ]; then ...in the function, or single-line strings which include that guard inline and then call the real function, e.g.if [ -z "${dontDoTheThing-} ]; then doTheThing; fi.This commit moves autoPatchelfHook to the former, which seems to be the most common style now.
Description of changes
There should be no functional changes.
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 usagerequireFile; I skipped those, andnixpkgs-reviewsupposedly queued a great deal many other packages for build but didn't actually build them. Regardless, all packages that were attempted built did build../result/bin/)Add a 👍 reaction to pull requests you find important.