diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index bd1f526900a..282aeca9ed1 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -18,11 +18,11 @@ wrapPythonProgramsIn() { for i in $(find "$dir" -type f -perm +0100); do # Rewrite "#! .../env python" to "#! /nix/store/.../python". - if head -n1 "$i" | grep -q '#!.*/env.*python'; then - sed -i "$i" -e "1 s^.*/env[ ]*python^#! $python^" + if head -n1 "$i" | grep -q '#!.*/env.*\(python\|pypy\)'; then + sed -i "$i" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^" fi - if head -n1 "$i" | grep -q /@executable_name@; then + if head -n1 "$i" | grep -q '/python\|/pypy'; then # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 544ae1694b9..2c7123a98d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28,7 +28,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { wrapPython = pkgs.makeSetupHook { deps = pkgs.makeWrapper; substitutions.libPrefix = python.libPrefix; - substitutions.executable_name = python.executable; substitutions.executable = "${python}/bin/${python.executable}"; } ../development/python-modules/generic/wrap.sh;