Author: chaoflow
Date: Sun Feb 26 17:23:44 2012
New Revision: 32594
URL: https://nixos.org/websvn/nix/?rev=32594&sc=1
Log:
suffix pythonpath
this is already the case for the pythonXYFull
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/wrap.sh
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/wrap.sh
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/wrap.sh
Sun Feb 26 17:23:42 2012 (r32593)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/wrap.sh
Sun Feb 26 17:23:44 2012 (r32594)
@@ -30,10 +30,16 @@
sed -i "$i" -e "1 s^.*/env[ ]*python^#! $python^"
fi
+ # PYTHONPATH is suffixed, PATH is prefixed. Reasoning:
+ # PATH is set in the environment and our packages' bin need to
+ # be chosen over the default PATH. PYTHONPATH is usually not
+ # set, so we can use it to override the modules chosen at
+ # install time. If we would want the same for PATH we could
+ # introduce PATH_OVERWRITE or similar.
if head -n1 "$i" | grep -q /python; then
echo "wrapping \`$i'..."
wrapProgram "$i" \
- --prefix PYTHONPATH ":" "$program_PYTHONPATH" \
+ --suffix PYTHONPATH ":" "$program_PYTHONPATH" \
--prefix PATH ":" $program_PATH
fi
done
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
