public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python.buildEnv: only wrap executables

Browse Source
This commit is contained in:
Robin Gloster 2017-08-09 15:06:03 +02:00
parent f4ca99166a
commit 4495bfe138
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/virtualization/xen/packages.nix
View File

@ -10,8 +10,6 @@ rec {
xen_4_5-vanilla = callPackage ./4.5.nix { xen_4_5-vanilla = callPackage ./4.5.nix {
# At the very least included seabios and etherboot need gcc49, # At the very least included seabios and etherboot need gcc49,
# so we have to build all of it with gcc49. # so we have to build all of it with gcc49.
stdenv = overrideCC stdenv gcc49;
meta = { meta = {
description = "vanilla"; description = "vanilla";
longDescription = '' longDescription = ''
@ -60,8 +58,6 @@ rec {
xen_4_8-vanilla = callPackage ./4.8.nix { xen_4_8-vanilla = callPackage ./4.8.nix {
# At the very least included seabios and etherboot need gcc49, # At the very least included seabios and etherboot need gcc49,
# so we have to build all of it with gcc49. # so we have to build all of it with gcc49.
stdenv = overrideCC stdenv gcc49;
meta = { meta = {
description = "vanilla"; description = "vanilla";
longDescription = '' longDescription = ''

2
pkgs/development/interpreters/python/wrapper.nix
View File

@ -28,8 +28,10 @@ let
for prg in *; do for prg in *; do
if [ -f "$prg" ]; then if [ -f "$prg" ]; then
rm -f "$out/bin/$prg" 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"
fi fi
fi
done done
fi fi
done done