From be901fa8befb762928e2c2f7805ce98c76dc2c53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 May 2012 21:00:30 +0000
Subject: [PATCH] * Add an installCheckPhase.

svn path=/nixpkgs/branches/stdenv-updates/; revision=33967
---
 pkgs/stdenv/generic/setup.sh                   | 17 ++++++++++++++++-
 pkgs/tools/package-management/nix/unstable.nix |  7 +++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 317f50679e0d..703ea53db8e0 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -767,6 +767,19 @@ fixupPhase() {
 }
 
 
+installCheckPhase() {
+    runHook preInstallCheck
+
+    echo "installcheck flags: $makeFlags ${makeFlagsArray[@]} $installCheckFlags ${installCheckFlagsArray[@]}"
+    make ${makefile:+-f $makefile} \
+        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
+        $makeFlags "${makeFlagsArray[@]}" \
+        $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck}
+
+    runHook postInstallCheck
+}
+
+
 distPhase() {
     runHook preDist
 
@@ -795,6 +808,7 @@ showPhaseHeader() {
         checkPhase) header "running tests";;
         installPhase) header "installing";;
         fixupPhase) header "post-installation fixup";;
+        installCheckPhase) header "running install tests";;
         *) header "$phase";;
     esac
 }
@@ -811,7 +825,7 @@ genericBuild() {
     if [ -z "$phases" ]; then
         phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
             configurePhase $preBuildPhases buildPhase checkPhase \
-            $preInstallPhases installPhase fixupPhase \
+            $preInstallPhases installPhase fixupPhase installCheckPhase \
             $preDistPhases distPhase $postPhases";
     fi
 
@@ -820,6 +834,7 @@ genericBuild() {
         if [ "$curPhase" = checkPhase -a -z "$doCheck" ]; then continue; fi
         if [ "$curPhase" = installPhase -a -n "$dontInstall" ]; then continue; fi
         if [ "$curPhase" = fixupPhase -a -n "$dontFixup" ]; then continue; fi
+        if [ "$curPhase" = installCheckPhase -a -z "$doInstallCheck" ]; then continue; fi
         if [ "$curPhase" = distPhase -a -z "$doDist" ]; then continue; fi
 
         if [ -n "$tracePhases" ]; then
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index edce730d73b8..ce62eb1e5621 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
       CFLAGS=-O3 CXXFLAGS=-O3
     '';
 
+  doInstallCheck = true;
+
   crossAttrs = {
     postUnpack =
       '' export CPATH="${bzip2.hostDrv}/include"
@@ -51,14 +53,11 @@ stdenv.mkDerivation rec {
       '' + stdenv.lib.optionalString (
           stdenv.cross ? nix && stdenv.cross.nix ? system
       ) ''--with-system=${stdenv.cross.nix.system}'';
-    doCheck = false;
-    postInstall = ":";
+    doInstallCheck = false;
   };
 
   enableParallelBuilding = true;
 
-  postInstall = "make installcheck";
-
   meta = {
     description = "The Nix Deployment System";
     homepage = http://nixos.org/;