From bd68cc6f5b9680cf3197e3306850a101e7b69fdd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 28 Feb 2012 17:10:50 +0000 Subject: nix-build: Honor user-provided `failureHook'. svn path=/nixpkgs/trunk/; revision=32680 --- pkgs/build-support/release/nix-build.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/build-support/release') diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index a32f0e07a0c..f734e1eefe5 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -12,6 +12,7 @@ , lcovExtraTraceFiles ? [] , src, stdenv , name ? if doCoverageAnalysis then "nix-coverage" else "nix-build" +, failureHook ? null , ... } @ args: stdenv.mkDerivation ( @@ -37,7 +38,8 @@ stdenv.mkDerivation ( fi ''; - failureHook = '' + failureHook = (stdenv.lib.optionalString (failureHook != null) failureHook) + + '' if test -n "$succeedOnFailure"; then if test -n "$keepBuildDirectory"; then KEEPBUILDDIR="$out/`basename $TMPDIR`" -- cgit 1.4.1