diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-07-11 11:58:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-11 11:58:00 +0200 |
| commit | b61238243c978cde19a0676f3da9e3fd575e55fc (patch) | |
| tree | d798588109682651b1b2b473080c8dd5853674e8 /pkgs/top-level | |
| parent | 0be14a588f69f980b547cb067c2363b78fbb8ab9 (diff) | |
| parent | 196273e177f2270d6d29b56e238f184c83394133 (diff) | |
| download | nixlib-b61238243c978cde19a0676f3da9e3fd575e55fc.tar nixlib-b61238243c978cde19a0676f3da9e3fd575e55fc.tar.gz nixlib-b61238243c978cde19a0676f3da9e3fd575e55fc.tar.bz2 nixlib-b61238243c978cde19a0676f3da9e3fd575e55fc.tar.lz nixlib-b61238243c978cde19a0676f3da9e3fd575e55fc.tar.xz nixlib-b61238243c978cde19a0676f3da9e3fd575e55fc.tar.zst nixlib-b61238243c978cde19a0676f3da9e3fd575e55fc.zip | |
Merge pull request #27079 from FRidh/virtualenvwrapper
virtualenvwrapper: only add Python to $PATH, fixes #26982
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ad11bbd4cf3..cfb5a901f5a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25208,9 +25208,9 @@ in { stevedore virtualenv virtualenv-clone - ] ++ optional isPy26 argparse; + ]; - patchPhase = '' + postPatch = '' for file in "virtualenvwrapper.sh" "virtualenvwrapper_lazy.sh"; do 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 cat > "$wrapper" << EOF -export PATH="$PATH:\$PATH" +export PATH="${python}/bin:\$PATH" export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" source "$wrapped" EOF |