summary refs log tree commit diff
path: root/pkgs/development/interpreters/python/mk-python-derivation.nix
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-12-21 15:49:06 -0500
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-12-21 15:54:52 -0500
commitdc906952be70e53270953df63419f5fdb256d343 (patch)
tree8a7f65914e2339b35da672449a902a149bcd575e /pkgs/development/interpreters/python/mk-python-derivation.nix
parent4a2340ff6bd0474d9a3e933f28b8568c59019b82 (diff)
downloadnixpkgs-dc906952be70e53270953df63419f5fdb256d343.tar
nixpkgs-dc906952be70e53270953df63419f5fdb256d343.tar.gz
nixpkgs-dc906952be70e53270953df63419f5fdb256d343.tar.bz2
nixpkgs-dc906952be70e53270953df63419f5fdb256d343.tar.lz
nixpkgs-dc906952be70e53270953df63419f5fdb256d343.tar.xz
nixpkgs-dc906952be70e53270953df63419f5fdb256d343.tar.zst
nixpkgs-dc906952be70e53270953df63419f5fdb256d343.zip
buildPythonPackage: Make setup hook part of nativeBuildInputs
This is better organization in general, but also needed to make python
work with #26805.
Diffstat (limited to 'pkgs/development/interpreters/python/mk-python-derivation.nix')
-rw-r--r--pkgs/development/interpreters/python/mk-python-derivation.nix17
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 5f7348ac825..d9cff16f448 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -13,7 +13,10 @@
 
 { name ? "${attrs.pname}-${attrs.version}"
 
-# Dependencies for building the package
+# Build-time dependencies for the package
+, nativeBuildInputs ? []
+
+# Run-time dependencies for the package
 , buildInputs ? []
 
 # Dependencies needed for running the checkPhase.
@@ -66,13 +69,15 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
 
   name = namePrefix + name;
 
-  buildInputs = ([ wrapPython (ensureNewerSourcesHook { year = "1980"; }) ]
-    ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip)
+  nativeBuildInputs = [ (ensureNewerSourcesHook { year = "1980"; }) ]
+    ++ nativeBuildInputs;
+
+  buildInputs = [ wrapPython ]
+    ++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip
     ++ lib.optionals doCheck checkInputs
-    ++ lib.optional catchConflicts setuptools # If we nog longer propagate setuptools
+    ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools
     ++ buildInputs
-    ++ pythonPath
-  );
+    ++ pythonPath;
 
   # Propagate python and setuptools. We should stop propagating setuptools.
   propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ];