From 4495bfe1382ea779f02996d0e18d25d892678e8c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 9 Aug 2017 15:06:03 +0200 Subject: [PATCH] python.buildEnv: only wrap executables --- pkgs/applications/virtualization/xen/packages.nix | 4 ---- pkgs/development/interpreters/python/wrapper.nix | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index 8f5262acb024..f4bde18f3df6 100644 --- 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 index f95e51c82ee7..9f355ddefda7 100644 --- 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