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

Revert "suffix pythonpath"

Browse Source 
This reverts commit a9a2b1e0dd8cdbb1dff3253d303b35d41f29b0f9.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32652
This commit is contained in:
Florian Friesdorf 2012-02-28 00:07:19 +00:00
parent 92da3fd865
commit 2ea5e2b576
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/python-modules/generic/wrap.sh
View File

@ -30,16 +30,10 @@ wrapPythonProgramsIn() {
sed -i "$i" -e "1 s^.*/env[ ]*python^#! $python^" sed -i "$i" -e "1 s^.*/env[ ]*python^#! $python^"
fi 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 if head -n1 "$i" | grep -q /python; then
echo "wrapping \`$i'..." echo "wrapping \`$i'..."
wrapProgram "$i" \ wrapProgram "$i" \
--suffix PYTHONPATH ":" "$program_PYTHONPATH" \ --prefix PYTHONPATH ":" "$program_PYTHONPATH" \
--prefix PATH ":" $program_PATH --prefix PATH ":" $program_PATH
fi fi
done done