Python: fix the wheel package

NixOS · Jun 16, 2016 · 9f2699f · 9f2699f · RonnyPfannschmidt · Jul 1, 2016
1 parent 1265acc
commit 9f2699f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pkgs/development/python-modules/generic/catch_conflicts.py b/pkgs/development/python-modules/generic/catch_conflicts.py
@@ -9,7 +9,7 @@
     for req in pkg_resources.find_distributions(f):
         if req not in packages[req.project_name]:
             # some exceptions inside buildPythonPackage
-            if req.project_name in ['setuptools', 'pip']:
+            if req.project_name in ['setuptools', 'pip', 'wheel']:
                 continue
             packages[req.project_name].append(req)
 

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -23607,6 +23607,9 @@ in modules // {
 
     propagatedBuildInputs = with self; [ jsonschema ];
 
+    # We add this flag to ignore the copy installed by bootstrapped-pip
+    installFlags = [ "--ignore-installed" ];
+
     meta = {
       description = "A built-package format for Python";
       license = with licenses; [ mit ];