about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2015-04-12 21:15:31 -0400
committerDomen Kožar <domen@dev.si>2015-04-12 21:15:36 -0400
commitc6512f7df348789af59617df7d2c865f9f8c29ab (patch)
tree1146ffeba0cd102df2d5fc2f9fc10603c0da8120
parent114ffa0d6c077969ed7e2bbbb211f8709d04e084 (diff)
downloadnixlib-c6512f7df348789af59617df7d2c865f9f8c29ab.tar
nixlib-c6512f7df348789af59617df7d2c865f9f8c29ab.tar.gz
nixlib-c6512f7df348789af59617df7d2c865f9f8c29ab.tar.bz2
nixlib-c6512f7df348789af59617df7d2c865f9f8c29ab.tar.lz
nixlib-c6512f7df348789af59617df7d2c865f9f8c29ab.tar.xz
nixlib-c6512f7df348789af59617df7d2c865f9f8c29ab.tar.zst
nixlib-c6512f7df348789af59617df7d2c865f9f8c29ab.zip
buildPythonPackage: propagate setuptools
-rw-r--r--pkgs/development/python-modules/generic/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 20fb2ec496b4..b962e9f84727 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -62,10 +62,10 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl
   ] ++ buildInputs ++ pythonPath
     ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip);
 
-  # propagate python to active setup-hook in nix-shell
-  propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader python ];
+  # propagate python/setuptools to active setup-hook in nix-shell
+  propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader python setuptools ];
 
-  pythonPath = [ setuptools ] ++ pythonPath;
+  pythonPath = pythonPath;
 
   configurePhase = attrs.configurePhase or ''
     runHook preConfigure