From c6512f7df348789af59617df7d2c865f9f8c29ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 12 Apr 2015 21:15:31 -0400
Subject: [PATCH] buildPythonPackage: propagate setuptools

---
 pkgs/development/python-modules/generic/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 20fb2ec496b..b962e9f8472 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