public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix-build: Honor user-provided `failureHook'.

Browse Source 
svn path=/nixpkgs/trunk/; revision=32680
This commit is contained in:
Ludovic Courtès 2012-02-28 17:10:50 +00:00
parent a70a76086c
commit bd68cc6f5b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/release/nix-build.nix
View File

@ -12,6 +12,7 @@
, lcovExtraTraceFiles ? [] , lcovExtraTraceFiles ? []
, src, stdenv , src, stdenv
, name ? if doCoverageAnalysis then "nix-coverage" else "nix-build" , name ? if doCoverageAnalysis then "nix-coverage" else "nix-build"
, failureHook ? null
, ... } @ args: , ... } @ args:
stdenv.mkDerivation ( stdenv.mkDerivation (
@ -37,7 +38,8 @@ stdenv.mkDerivation (
fi fi
''; '';
failureHook = '' failureHook = (stdenv.lib.optionalString (failureHook != null) failureHook) +
''
if test -n "$succeedOnFailure"; then if test -n "$succeedOnFailure"; then
if test -n "$keepBuildDirectory"; then if test -n "$keepBuildDirectory"; then
KEEPBUILDDIR="$out/`basename $TMPDIR`" KEEPBUILDDIR="$out/`basename $TMPDIR`"