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

Merge #14753: makeWrapper: allow spaces in variables

Browse Source
This commit is contained in:
Vladimír Čunát 2016-06-09 13:09:43 +02:00
commit cec03a8ecd
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/setup-hooks/make-wrapper.sh
View File

@ -16,7 +16,7 @@ makeWrapper() {
varName=${params[$((n + 1))]} varName=${params[$((n + 1))]}
value=${params[$((n + 2))]} value=${params[$((n + 2))]}
n=$((n + 2)) n=$((n + 2))
echo "export $varName=$value" >> $wrapper echo "export $varName='$value'" >> $wrapper
fi fi
if test "$p" = "--unset"; then if test "$p" = "--unset"; then

13
pkgs/development/python-modules/generic/wrap.sh
View File

@ -46,16 +46,15 @@ wrapPythonProgramsIn() {
# wrapProgram creates the executable shell script described # wrapProgram creates the executable shell script described
# above. The script will set PYTHONPATH and PATH variables.! # above. The script will set PYTHONPATH and PATH variables.!
# (see pkgs/build-support/setup-hooks/make-wrapper.sh) # (see pkgs/build-support/setup-hooks/make-wrapper.sh)
local wrap_args="$f \ local -a wrap_args=("$f"
--prefix PYTHONPATH ':' $program_PYTHONPATH \ --prefix PYTHONPATH ':' "$program_PYTHONPATH"
--prefix PATH ':' $program_PATH:$dir/bin" --prefix PATH ':' "$program_PATH:$dir/bin")
# Add any additional arguments provided by makeWrapperArgs # Add any additional arguments provided by makeWrapperArgs
# argument to buildPythonPackage. # argument to buildPythonPackage.
for arg in $makeWrapperArgs; do local -a user_args="($makeWrapperArgs)"
wrap_args="$wrap_args $arg" local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}")
done wrapProgram "${wrapProgramArgs[@]}"
wrapProgram $wrap_args
fi fi
fi fi
done done