diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-01 07:04:39 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-01 07:04:39 +0000 |
| commit | 0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc (patch) | |
| tree | c1c7f6ea999ae4f455500ba2599c58e41aa581ad /pkgs/build-support/release | |
| parent | b14a737a4d86608bd61acf08cfc479bf262e9d99 (diff) | |
| parent | 57b612cb050778c4ded12fe8e45de26b91eeef70 (diff) | |
| download | nixpkgs-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar nixpkgs-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.gz nixpkgs-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.bz2 nixpkgs-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.lz nixpkgs-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.xz nixpkgs-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.zst nixpkgs-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
Diffstat (limited to 'pkgs/build-support/release')
| -rw-r--r-- | pkgs/build-support/release/nix-build.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 64d8b8f1924..7e2a0d4f03b 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`" |