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

Merge branch 'staging'

Browse Source 
This includes a security update of expat.
This commit is contained in:
Vladimír Čunát
2016-06-29 07:47:04 +02:00
parent d9036a02b5 f4792cdc0c
commit 3afa246038
64 changed files with 529 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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