diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-02-21 17:49:45 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-02-21 17:49:45 +0100 |
| commit | 846aa6e77665fba3fb1f1e1eadc7a715f4b4e89d (patch) | |
| tree | 65455f3fffc1288a6686b3851e941f067218e1a8 /pkgs/top-level | |
| parent | a6638c62a84a5208251cf40cceade9c472a47217 (diff) | |
| parent | 696052cb622b718cfe7543126b86d543ba19f43b (diff) | |
| download | nixlib-846aa6e77665fba3fb1f1e1eadc7a715f4b4e89d.tar nixlib-846aa6e77665fba3fb1f1e1eadc7a715f4b4e89d.tar.gz nixlib-846aa6e77665fba3fb1f1e1eadc7a715f4b4e89d.tar.bz2 nixlib-846aa6e77665fba3fb1f1e1eadc7a715f4b4e89d.tar.lz nixlib-846aa6e77665fba3fb1f1e1eadc7a715f4b4e89d.tar.xz nixlib-846aa6e77665fba3fb1f1e1eadc7a715f4b4e89d.tar.zst nixlib-846aa6e77665fba3fb1f1e1eadc7a715f4b4e89d.zip | |
Merge pull request #13165 from NixOS/python-wip
Python PIP fix, fixes #12190, closes #13035
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f925e688933e..df742a5c84cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15067,6 +15067,10 @@ in modules // { sha256 = "46f4bd0d8dfd51125a554568d646fe4200a3c2c6c36b9f2d06d2212148439521"; }; + # pip detects that we already have bootstrapped_pip "installed", so we need + # to force it a little. + installFlags = [ "--ignore-installed" ]; + buildInputs = with self; [ mock scripttest virtualenv pytest ]; }; @@ -15492,7 +15496,7 @@ in modules // { ${python.executable} setup.py test ''; - installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--cpp_implementation"; + installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--install-option='--cpp_implementation'"; doCheck = true; |