mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Merge pull request #217565 from winterqt/bootstrapped-pip-remove-extraneous-pythonpath-entry
This commit is contained in:
commit
c7ba59e485
@ -38,9 +38,10 @@ stdenv.mkDerivation rec {
|
||||
mv pip* pip
|
||||
mv setuptools* setuptools
|
||||
mv wheel* wheel
|
||||
# Set up PYTHONPATH. The above folders need to be on PYTHONPATH
|
||||
# $out is where we are installing to and takes precedence
|
||||
export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$(pwd)/wheel:$PYTHONPATH"
|
||||
# Set up PYTHONPATH:
|
||||
# - pip and setuptools need to be in PYTHONPATH to install setuptools, wheel, and pip.
|
||||
# - $out is where we are installing to and takes precedence, and is where wheel will end so we can install pip.
|
||||
export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$PYTHONPATH"
|
||||
|
||||
echo "Building setuptools wheel..."
|
||||
pushd setuptools
|
||||
|
@ -38,9 +38,10 @@ stdenv.mkDerivation rec {
|
||||
mv pip* pip
|
||||
mv setuptools* setuptools
|
||||
mv wheel* wheel
|
||||
# Set up PYTHONPATH. The above folders need to be on PYTHONPATH
|
||||
# $out is where we are installing to and takes precedence
|
||||
export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$(pwd)/wheel:$PYTHONPATH"
|
||||
# Set up PYTHONPATH:
|
||||
# - pip and setuptools need to be in PYTHONPATH to install setuptools, wheel, and pip.
|
||||
# - $out is where we are installing to and takes precedence, and is where wheel will end so we can install pip.
|
||||
export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$PYTHONPATH"
|
||||
|
||||
echo "Building setuptools wheel..."
|
||||
pushd setuptools
|
||||
|
Loading…
Reference in New Issue
Block a user