diff options
author | Winter <winter@winter.cafe> | 2023-02-21 16:21:41 -0500 |
---|---|---|
committer | Winter <winter@winter.cafe> | 2023-02-21 16:21:41 -0500 |
commit | e59046bc48bd57a15b99b92be55520af4923f5c3 (patch) | |
tree | 0642a0eee7001f13d818651446399b3acfac3499 /pkgs/development/python2-modules | |
parent | fc3641aa1e3031088747752caca78d9083d70f7b (diff) | |
download | nixlib-e59046bc48bd57a15b99b92be55520af4923f5c3.tar nixlib-e59046bc48bd57a15b99b92be55520af4923f5c3.tar.gz nixlib-e59046bc48bd57a15b99b92be55520af4923f5c3.tar.bz2 nixlib-e59046bc48bd57a15b99b92be55520af4923f5c3.tar.lz nixlib-e59046bc48bd57a15b99b92be55520af4923f5c3.tar.xz nixlib-e59046bc48bd57a15b99b92be55520af4923f5c3.tar.zst nixlib-e59046bc48bd57a15b99b92be55520af4923f5c3.zip |
python{2,3}Packages.bootstrapped-pip: remove extraneous entry from PYTHONPATH
From my testing, wheel is only retrieved from its installation in $out, and removing it doesn't break anything. I'm unsure if it was required when bootstrapping was initially added [0], but it definitely isn't now. I also took the chance to clarify the comment a bit. [0]: 56727dc1ff430bc2d39b08601e03094de4ab189e
Diffstat (limited to 'pkgs/development/python2-modules')
-rw-r--r-- | pkgs/development/python2-modules/bootstrapped-pip/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/python2-modules/bootstrapped-pip/default.nix b/pkgs/development/python2-modules/bootstrapped-pip/default.nix index 2fc8b8b8d4b7..314bf0048c8a 100644 --- a/pkgs/development/python2-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python2-modules/bootstrapped-pip/default.nix @@ -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 |