diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-10-13 15:50:37 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-10-13 16:10:58 +0200 |
| commit | 4e6826a3b2b4e0e95d0af6ef83360962c78125cb (patch) | |
| tree | 2a6be7c8cc62a75a4cc5c4348663a00726e47a38 /pkgs/development/interpreters | |
| parent | 84c09b109e0bf185c68d90770f275930d02fac24 (diff) | |
| parent | b5697c6954d4b261d354cb6630385fe280f15ef9 (diff) | |
| download | nixlib-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.tar nixlib-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.tar.gz nixlib-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.tar.bz2 nixlib-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.tar.lz nixlib-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.tar.xz nixlib-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.tar.zst nixlib-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.zip | |
Merge branch 'staging-next'
It's not perfect, but I think we can deal with the rest of the regressions directly on master, so that this process does not stall.
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh index db3e4225d293..c99ef313c102 100644 --- a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh @@ -27,9 +27,9 @@ setuptoolsShellHook() { if test -e setup.py; then tmp_path=$(mktemp -d) export PATH="$tmp_path/bin:$PATH" - export PYTHONPATH="@pythonSitePackages@:$PYTHONPATH" + export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH" mkdir -p "$tmp_path/@pythonSitePackages@" - eval "@pythonInterpreter@ -m pip -e . --prefix $tmp_path >&2" + eval "@pythonInterpreter@ -m pip install -e . --prefix $tmp_path >&2" fi runHook postShellHook |