Merge pull request #27079 from FRidh/virtualenvwrapper

virtualenvwrapper: only add Python to $PATH, fixes #26982
This commit is contained in:
Frederik Rietdijk 2017-07-11 11:58:00 +02:00 committed by GitHub
commit b61238243c

View File

@ -25208,9 +25208,9 @@ in {
stevedore stevedore
virtualenv virtualenv
virtualenv-clone virtualenv-clone
] ++ optional isPy26 argparse; ];
patchPhase = '' postPatch = ''
for file in "virtualenvwrapper.sh" "virtualenvwrapper_lazy.sh"; do for file in "virtualenvwrapper.sh" "virtualenvwrapper_lazy.sh"; do
substituteInPlace "$file" --replace "which" "${pkgs.which}/bin/which" substituteInPlace "$file" --replace "which" "${pkgs.which}/bin/which"
@ -25241,7 +25241,7 @@ in {
# WARNING: Don't indent the lines below because that would break EOF # WARNING: Don't indent the lines below because that would break EOF
cat > "$wrapper" << EOF cat > "$wrapper" << EOF
export PATH="$PATH:\$PATH" export PATH="${python}/bin:\$PATH"
export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)"
source "$wrapped" source "$wrapped"
EOF EOF