* Move buildPythonPackage and setuptools into python-packages.nix.

  This ensures that they're built with the same "python" argument.

svn path=/nixpkgs/branches/modular-python/; revision=26593

1 files changed, 16 insertions, 35 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";