public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autoPatchelfHook: Make easier to run autoPatchelf

Browse Source 
The autoPatchelf main function which is run against all of the outputs
was pretty much tailored towards this specific setup-hook and was
relying on $prefix to be set globally.

So if you wanted to run autoPatchelf manually - let's say during
buildPhase - you would have needed to run it like this:

  prefix=/some/directory autoPatchelf

This is now more intuitive and all you need to do is run the following:

  autoPatchelf /some/directory

Signed-off-by: aszlig <aszlig@nix.build>
This commit is contained in:
aszlig 2018-11-19 17:18:27 +01:00
parent 3ae0407d3c
commit d03e4ffdbf
No known key found for this signature in database
GPG Key ID: 684089CE67EBB691
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/setup-hooks/auto-patchelf.sh
View File

@ -153,7 +153,7 @@ autoPatchelf() {
# Add all shared objects of the current output path to the start of # Add all shared objects of the current output path to the start of
# cachedDependencies so that it's choosen first in findDependency. # cachedDependencies so that it's choosen first in findDependency.
cachedDependencies+=( cachedDependencies+=(
$(find "$prefix" \! -type d \( -name '*.so' -o -name '*.so.*' \)) $(find "$@" \! -type d \( -name '*.so' -o -name '*.so.*' \))
) )
local elffile local elffile
@ -169,7 +169,7 @@ autoPatchelf() {
LANG=C readelf -l "$file" | grep -q "^ *INTERP\\>" || continue LANG=C readelf -l "$file" | grep -q "^ *INTERP\\>" || continue
fi fi
autoPatchelfFile "$file" autoPatchelfFile "$file"
done < <(find "$prefix" -type f -print0) done < <(find "$@" -type f -print0)
} }
# XXX: This should ultimately use fixupOutputHooks but we currently don't have # XXX: This should ultimately use fixupOutputHooks but we currently don't have
@ -181,5 +181,5 @@ autoPatchelf() {
# behaviour as fixupOutputHooks because the setup hook for patchelf is run in # behaviour as fixupOutputHooks because the setup hook for patchelf is run in
# fixupOutput and the postFixup hook runs later. # fixupOutput and the postFixup hook runs later.
postFixupHooks+=( postFixupHooks+=(
'for output in $outputs; do prefix="${!output}" autoPatchelf; done' 'autoPatchelf $(for output in $outputs; do echo "${!output}"; done)'
) )