diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-09 13:09:43 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-09 13:09:43 +0200 |
| commit | cec03a8ecdd5f74f7bc258c0b8406e1e61dc6c9c (patch) | |
| tree | d73b1e10440088346fa135a8978b188ab747e9d3 /pkgs | |
| parent | b9d42f79c979489d678e99b0faa2fc6e0a8977dc (diff) | |
| parent | d534e38d58fb8c91236db5aff6dd2a1b8566bfa2 (diff) | |
| download | nixlib-cec03a8ecdd5f74f7bc258c0b8406e1e61dc6c9c.tar nixlib-cec03a8ecdd5f74f7bc258c0b8406e1e61dc6c9c.tar.gz nixlib-cec03a8ecdd5f74f7bc258c0b8406e1e61dc6c9c.tar.bz2 nixlib-cec03a8ecdd5f74f7bc258c0b8406e1e61dc6c9c.tar.lz nixlib-cec03a8ecdd5f74f7bc258c0b8406e1e61dc6c9c.tar.xz nixlib-cec03a8ecdd5f74f7bc258c0b8406e1e61dc6c9c.tar.zst nixlib-cec03a8ecdd5f74f7bc258c0b8406e1e61dc6c9c.zip | |
Merge #14753: makeWrapper: allow spaces in variables
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/setup-hooks/make-wrapper.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/generic/wrap.sh | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index 7d0f88abb855..d3db0b64bd53 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -16,7 +16,7 @@ makeWrapper() { varName=${params[$((n + 1))]} value=${params[$((n + 2))]} n=$((n + 2)) - echo "export $varName=$value" >> $wrapper + echo "export $varName='$value'" >> $wrapper fi if test "$p" = "--unset"; then diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index a67ea51f5a9b..efbb1e737876 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -46,16 +46,15 @@ wrapPythonProgramsIn() { # wrapProgram creates the executable shell script described # above. The script will set PYTHONPATH and PATH variables.! # (see pkgs/build-support/setup-hooks/make-wrapper.sh) - local wrap_args="$f \ - --prefix PYTHONPATH ':' $program_PYTHONPATH \ - --prefix PATH ':' $program_PATH:$dir/bin" + local -a wrap_args=("$f" + --prefix PYTHONPATH ':' "$program_PYTHONPATH" + --prefix PATH ':' "$program_PATH:$dir/bin") # Add any additional arguments provided by makeWrapperArgs # argument to buildPythonPackage. - for arg in $makeWrapperArgs; do - wrap_args="$wrap_args $arg" - done - wrapProgram $wrap_args + local -a user_args="($makeWrapperArgs)" + local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") + wrapProgram "${wrapProgramArgs[@]}" fi fi done |