Revert "include site in pythonpath of wrapped scripts, if python-site is installed"
This reverts commit 1ac12b0d4b64936104cb6031b02c92c3d1845ae5. svn path=/nixpkgs/branches/stdenv-updates/; revision=32654
This commit is contained in:
@@ -15,14 +15,6 @@ wrapPythonProgramsIn() {
|
||||
_addToPythonPath $i
|
||||
done
|
||||
|
||||
program_PYTHONPATH='$(
|
||||
# activate site if installed
|
||||
bindir=$(dirname "$0")
|
||||
pysite="$bindir/pysite"
|
||||
relpath=$(test -x "$pysite" && "$pysite" path)
|
||||
echo -n ${relpath:+"$relpath":}
|
||||
)'"$program_PYTHONPATH"
|
||||
|
||||
for i in $(find "$dir" -type f -perm +0100); do
|
||||
|
||||
# Rewrite "#! .../env python" to "#! /nix/store/.../python".
|
||||
@@ -33,7 +25,7 @@ wrapPythonProgramsIn() {
|
||||
if head -n1 "$i" | grep -q /python; then
|
||||
echo "wrapping \`$i'..."
|
||||
wrapProgram "$i" \
|
||||
--prefix PYTHONPATH ":" "$program_PYTHONPATH" \
|
||||
--prefix PYTHONPATH ":" $program_PYTHONPATH \
|
||||
--prefix PATH ":" $program_PATH
|
||||
fi
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user