diff options
| author | Robin Gloster <mail@glob.in> | 2017-08-09 15:06:03 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-08-09 15:07:03 +0200 |
| commit | 4495bfe1382ea779f02996d0e18d25d892678e8c (patch) | |
| tree | c828d624db86f0bec8428049988081256b404dce /pkgs | |
| parent | f4ca99166a8b270b62ed81949ebc0612478fa716 (diff) | |
| download | nixlib-4495bfe1382ea779f02996d0e18d25d892678e8c.tar nixlib-4495bfe1382ea779f02996d0e18d25d892678e8c.tar.gz nixlib-4495bfe1382ea779f02996d0e18d25d892678e8c.tar.bz2 nixlib-4495bfe1382ea779f02996d0e18d25d892678e8c.tar.lz nixlib-4495bfe1382ea779f02996d0e18d25d892678e8c.tar.xz nixlib-4495bfe1382ea779f02996d0e18d25d892678e8c.tar.zst nixlib-4495bfe1382ea779f02996d0e18d25d892678e8c.zip | |
python.buildEnv: only wrap executables
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/virtualization/xen/packages.nix | 4 | ||||
| -rw-r--r-- | 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 |