diff options
Diffstat (limited to 'nixpkgs/pkgs/development/interpreters/python')
-rw-r--r-- | nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix index 7718bdfde5d3..4951ae4499f8 100644 --- a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -72,14 +72,17 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr name = namePrefix + name; - nativeBuildInputs = [ ensureNewerSourcesForZipFilesHook ] - ++ nativeBuildInputs; - - buildInputs = [ wrapPython ] - ++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip + nativeBuildInputs = [ + python + wrapPython + ensureNewerSourcesForZipFilesHook + setuptools # ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools - ++ buildInputs - ++ pythonPath; + ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ + unzip + ] ++ nativeBuildInputs; + + buildInputs = buildInputs ++ pythonPath; # Propagate python and setuptools. We should stop propagating setuptools. propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; |