From d16a15c0a5ca4bc879fbb3796aca0589f42923cf Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Mon, 27 Feb 2012 17:34:02 +0000
Subject: [PATCH] move checkPhase after fixupPhase for python packages

authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32625
---
 pkgs/development/python-modules/generic/builder.sh  | 9 +++++++++
 pkgs/development/python-modules/generic/default.nix | 4 ++++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/development/python-modules/generic/builder.sh

diff --git a/pkgs/development/python-modules/generic/builder.sh b/pkgs/development/python-modules/generic/builder.sh
new file mode 100644
index 00000000000..6cad5e99aa3
--- /dev/null
+++ b/pkgs/development/python-modules/generic/builder.sh
@@ -0,0 +1,9 @@
+source $stdenv/setup
+
+# move checkPhase from after buildPhase to after fixupPhase
+phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
+        configurePhase $preBuildPhases buildPhase \
+        $preInstallPhases installPhase fixupPhase checkPhase \
+        $preDistPhases distPhase $postPhases";
+
+genericBuild
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index c208c0bcff2..8197e5e7431 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -54,6 +54,7 @@
 
 , doCheck ? true
 
+# run after fixupPhase
 , checkPhase ?
     ''
       runHook preCheck
@@ -69,6 +70,9 @@
 python.stdenv.mkDerivation (attrs // {
   inherit doCheck buildPhase checkPhase;
 
+  # moves checkPhase from after buildPhase to after fixupPhase
+  builder = ./builder.sh;
+
   name = namePrefix + name;
 
   buildInputs = [ python wrapPython setuptools unzip ] ++ buildInputs ++ pythonPath;