3 files changed, 34 insertions, 47 deletions
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 1cdbb2e26245..50b73aaf8f60 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -1,48 +1,29 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
-
-  version = a.lib.attrByPath ["version"] "0.6c11" a; 
-  buildInputs = with a; [
-    python makeWrapper
-  ];
-in
-rec {
-  name = "setuptools-" + version;
+{ stdenv, fetchurl, python, wrapPython }:
+
+stdenv.mkDerivation rec {
+  name = "setuptools-0.6c11";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/s/setuptools/${name}.tar.gz";
     sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
-
-  doCheck = true;
-
-  doMakeCheck = a.fullDepEntry (''
-    python setup.py test
-  '') ["minInit" "doUnpack" "addInputs" "doBuild"];
-
-  doBuild = a.fullDepEntry(''
-    python setup.py build --build-base $out
-  '') ["addInputs" "doUnpack"];
+  buildInputs = [ python wrapPython ];
 
-  doInstall = a.fullDepEntry(''
-    ensureDir "$out/lib/${a.python.libPrefix}/site-packages"
+  buildPhase = "python setup.py build --build-base $out";
 
-    PYTHONPATH="$out/lib/${a.python.libPrefix}/site-packages:$PYTHONPATH" \
-    python setup.py install --prefix="$out"
+  installPhase =
+    ''
+      dst=$out/lib/${python.libPrefix}/site-packages
+      mkdir -p $dst
+      PYTHONPATH=$dst:$PYTHONPATH
+      python setup.py install --prefix=$out
+      wrapPythonPrograms
+    '';
 
-    for i in "$out/bin/"*
-    do
-      wrapProgram "$i"                          \
-        --prefix PYTHONPATH ":"			\
-          "$out/lib/${a.python.libPrefix}/site-packages"
-    done
-  '') ["doBuild"];
+  doCheck = false; # doesn't work with Python 2.7
 
-  phaseNames = ["doBuild" "doInstall"];
+  checkPhase = "python setup.py test";
 
   meta = {
     description = "Utilities to facilitate the installation of Python packages";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cdd80835569..b0d77d6e066d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4299,20 +4299,13 @@ let
 
   ### DEVELOPMENT / PYTHON MODULES
 
-  buildPythonPackage = buildPython27Package;
-
-  buildPython27Package = import ../development/python-modules/generic {
-    inherit wrapPython lib;
-    python = python27;
-    setuptools = setuptools.override { python = python27; doCheck = false; };
-  };
+  buildPythonPackage = pythonPackages.buildPythonPackage;
 
   pythonPackages = python27Packages;
 
   python27Packages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;
     python = python27;
-    buildPythonPackage = buildPython27Package;
   });
 
   foursuite = callPackage ../development/python-modules/4suite { };
@@ -4355,9 +4348,7 @@ let
 
   pyxml = callPackage ../development/python-modules/pyxml { };
 
-  setuptools = builderDefsPackage (import ../development/python-modules/setuptools) {
-    inherit python makeWrapper;
-  };
+  setuptools = pythonPackages.setuptools;
 
   wxPython = wxPython26;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f49beee5f183..dcbe03e615c4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1,11 +1,26 @@
-{ pkgs, python, buildPythonPackage }:
+{ pkgs, python }:
 
 python.modules // rec {
 
+  inherit python;
+
   inherit (pkgs) fetchurl fetchsvn stdenv;
 
   inherit (python.modules) ssl;
+
+
+  buildPythonPackage = import ../development/python-modules/generic {
+    inherit (pkgs) wrapPython lib;
+    inherit python setuptools;
+  };
+
   
+  setuptools = import ../development/python-modules/setuptools {
+    inherit (pkgs) stdenv fetchurl wrapPython;
+    inherit python;
+  };
+
+
 
   argparse = buildPythonPackage (rec {
     name = "argparse-1.1";