* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25244

pkgs/build-support/builder-defs/builder-defs.nix

@@ -384,6 +384,14 @@ let inherit (builtins) head tail trace; in
                 echo '${toString (attrByPath ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs
         ") ["minInit" "defEnsureDir"];
 
+        cmakeFlags = "";
+
+	doCmake = fullDepEntry (''
+          mkdir build
+	  cd build
+	  cmake -D CMAKE_INSTALL_PREFIX="$out" ${toString cmakeFlags} ..
+	'') ["minInit" "addInputs" "doUnpack"];
+
         /*debug = x:(trace x x);
         debugX = x:(trace (toXML x) x);*/
 

pkgs/build-support/release/nix-build.nix

@@ -36,6 +36,18 @@ stdenv.mkDerivation (
           cp $origSrc/nix-support/hydra-release-name $out/nix-support/hydra-release-name
         fi
       '';
+
+    failureHook = ''
+      if test -n "$succeedOnFailure"; then
+          if test -n "$keepBuildDirectory"; then
+              KEEPBUILDDIR="$out/`basename $TMPDIR`"
+              header "Copying build directory to $KEEPBUILDDIR"
+              ensureDir $KEEPBUILDDIR
+              cp -vR $TMPDIR/* $KEEPBUILDDIR
+              stopNest 
+          fi
+      fi
+    '';
   }
 
   // args //