From eb35e3bd130cc8b80ece0164135b0cca66aab05c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:44 +0000 Subject: [PATCH] suffix pythonpath this is already the case for the pythonXYFull svn path=/nixpkgs/branches/stdenv-updates/; revision=32594 --- pkgs/development/python-modules/generic/wrap.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 9f3803f791b..756faaa13c0 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -30,10 +30,16 @@ wrapPythonProgramsIn() { 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