diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-21 08:37:30 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-21 08:37:30 +0200 |
| commit | 86c7662be0a2cef3d1d6f152e84ff436129dd2c1 (patch) | |
| tree | a195f510944c7d8f9a4efc683816491a05a269d9 /pkgs/development/interpreters | |
| parent | 04ce4c3e42ec15c4420657052110d928dbdf5d84 (diff) | |
| parent | ca6ee8f519733e1f45b7598d995245dd687f535c (diff) | |
| download | nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.gz nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.bz2 nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.lz nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.xz nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.zst nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.zip | |
Merge staging-next into master
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/python/wrapper.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 8d4e68bf57ca..27d01e4e1f51 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -4,6 +4,8 @@ , postBuild ? "" , ignoreCollisions ? false , requiredPythonModules +# Wrap executables with the given argument. +, makeWrapperArgs ? [] , }: # Create a python executable that knows about additional packages. @@ -32,7 +34,7 @@ let if [ -f "$prg" ]; then rm -f "$out/bin/$prg" if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true" + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} fi fi done |