Merge pull request #217565 from winterqt/bootstrapped-pip-remove-extraneous-pythonpath-entry

This commit is contained in:
Sandro 2023-07-19 15:22:52 +02:00 committed by GitHub
commit c7ba59e485
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions

View File

@ -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

View File

@ -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