mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 20:49:52 +03:00
auto-patchelf: add support for __structuredAttrs
This commit is contained in:
parent
4ed08e5601
commit
9faad7fb0b
@ -53,7 +53,18 @@ autoPatchelf() {
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
readarray -td' ' ignoreMissingDepsArray < <(echo -n "$autoPatchelfIgnoreMissingDeps")
|
if [ -n "$__structuredAttrs" ]; then
|
||||||
|
local ignoreMissingDepsArray=( "${autoPatchelfIgnoreMissingDeps[@]}" )
|
||||||
|
local appendRunpathsArray=( "${appendRunpaths[@]}" )
|
||||||
|
local runtimeDependenciesArray=( "${runtimeDependencies[@]}" )
|
||||||
|
local patchelfFlagsArray=( "${patchelfFlags[@]}" )
|
||||||
|
else
|
||||||
|
readarray -td' ' ignoreMissingDepsArray < <(echo -n "$autoPatchelfIgnoreMissingDeps")
|
||||||
|
local appendRunpathsArray=($appendRunpaths)
|
||||||
|
local runtimeDependenciesArray=($runtimeDependencies)
|
||||||
|
local patchelfFlagsArray=($patchelfFlags)
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "$autoPatchelfIgnoreMissingDeps" == "1" ]; then
|
if [ "$autoPatchelfIgnoreMissingDeps" == "1" ]; then
|
||||||
echo "autoPatchelf: WARNING: setting 'autoPatchelfIgnoreMissingDeps" \
|
echo "autoPatchelf: WARNING: setting 'autoPatchelfIgnoreMissingDeps" \
|
||||||
"= true;' is deprecated and will be removed in a future release." \
|
"= true;' is deprecated and will be removed in a future release." \
|
||||||
@ -61,9 +72,6 @@ autoPatchelf() {
|
|||||||
ignoreMissingDepsArray=( "*" )
|
ignoreMissingDepsArray=( "*" )
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local appendRunpathsArray=($appendRunpaths)
|
|
||||||
local runtimeDependenciesArray=($runtimeDependencies)
|
|
||||||
local patchelfFlagsArray=($patchelfFlags)
|
|
||||||
@pythonInterpreter@ @autoPatchelfScript@ \
|
@pythonInterpreter@ @autoPatchelfScript@ \
|
||||||
${norecurse:+--no-recurse} \
|
${norecurse:+--no-recurse} \
|
||||||
--ignore-missing "${ignoreMissingDepsArray[@]}" \
|
--ignore-missing "${ignoreMissingDepsArray[@]}" \
|
||||||
|
Loading…
Reference in New Issue
Block a user