python.buildEnv: only wrap executables

NixOS · Aug 9, 2017 · 4495bfe · 4495bfe · FRidh · Aug 10, 2017
1 parent f4ca991
commit 4495bfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix
@@ -10,8 +10,6 @@ rec {
   xen_4_5-vanilla = callPackage ./4.5.nix {
     # At the very least included seabios and etherboot need gcc49,
     # so we have to build all of it with gcc49.
-    stdenv = overrideCC stdenv gcc49;
-
     meta = {
       description = "vanilla";
       longDescription = ''
@@ -60,8 +58,6 @@ rec {
   xen_4_8-vanilla = callPackage ./4.8.nix {
     # At the very least included seabios and etherboot need gcc49,
     # so we have to build all of it with gcc49.
-    stdenv = overrideCC stdenv gcc49;
-
     meta = {
       description = "vanilla";
       longDescription = ''

diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
@@ -28,7 +28,9 @@ let
           for prg in *; do
             if [ -f "$prg" ]; then
               rm -f "$out/bin/$prg"
-              makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true"
+              if [ -x "$prg" ]; then
+                makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true"
+              fi
             fi
           done
         fi