From 548ced628d233e6ec5431ae3d8d1668d65177639 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 13 Oct 2018 10:56:51 +0200 Subject: [PATCH] python.buildEnv: new argument `makeWrapperArgs` `python.buildEnv` would already wrap executables exporting `PYTHONHOME`. With this change, it is possible to pass in additional arguments to the underlying `makeWrapper`. --- pkgs/development/interpreters/python/wrapper.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 8d4e68bf57c..27d01e4e1f5 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