From 2ea5e2b5766ae77f8b5db010f0d6aaf8b8cff02b Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 28 Feb 2012 00:07:19 +0000
Subject: [PATCH] Revert "suffix pythonpath"

This reverts commit a9a2b1e0dd8cdbb1dff3253d303b35d41f29b0f9.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32652
---
 pkgs/development/python-modules/generic/wrap.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index 756faaa13c0a..9f3803f791ba 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -30,16 +30,10 @@ 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" \
-                --suffix PYTHONPATH ":" "$program_PYTHONPATH" \
+                --prefix PYTHONPATH ":" "$program_PYTHONPATH" \
                 --prefix PATH ":" $program_PATH
         fi
     done