From dc906952be70e53270953df63419f5fdb256d343 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 21 Dec 2017 15:49:06 -0500
Subject: [PATCH] buildPythonPackage: Make setup hook part of nativeBuildInputs
This is better organization in general, but also needed to make python
work with #26805.
---
.../python/mk-python-derivation.nix | 17 +++++++++++------
1 file 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 ];