diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:49:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:49:56 +0200 |
| commit | c05d8295988697adbb920a7b4a999ae3670c5504 (patch) | |
| tree | 7a5526cffad30206f814560c72f13829e4d9c396 /pkgs/development/python-modules | |
| parent | f073df60d60444c30c49cb26d6b187a4100b41fe (diff) | |
| parent | ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7 (diff) | |
| download | nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.gz nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.bz2 nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.lz nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.xz nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.zst nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.zip | |
Merge branch 'staging'
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/generic/wrap.sh | 13 |
1 files changed, 6 insertions, 7 deletions
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 |