diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-05 10:31:16 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-01-15 10:16:11 +0100 |
| commit | c5d99308def0ec6abc12aa90685d984a72437f0c (patch) | |
| tree | e73737400d6d725d5b703c5c8df89e00acf4f7a7 /pkgs/development/interpreters/python/mk-python-derivation.nix | |
| parent | 05ee1015bbbe38124444bf9de22523aaf2821998 (diff) | |
| download | nixpkgs-c5d99308def0ec6abc12aa90685d984a72437f0c.tar nixpkgs-c5d99308def0ec6abc12aa90685d984a72437f0c.tar.gz nixpkgs-c5d99308def0ec6abc12aa90685d984a72437f0c.tar.bz2 nixpkgs-c5d99308def0ec6abc12aa90685d984a72437f0c.tar.lz nixpkgs-c5d99308def0ec6abc12aa90685d984a72437f0c.tar.xz nixpkgs-c5d99308def0ec6abc12aa90685d984a72437f0c.tar.zst nixpkgs-c5d99308def0ec6abc12aa90685d984a72437f0c.zip | |
buildPython*: fix nativeBuildInputs
Diffstat (limited to 'pkgs/development/interpreters/python/mk-python-derivation.nix')
| -rw-r--r-- | pkgs/development/interpreters/python/mk-python-derivation.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 7718bdfde5d..4951ae4499f 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/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 ]; |