From 06d28ca8f1e9ef040f9398e4d1a035d40006bd47 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Mar 2012 02:45:52 +0000 Subject: [PATCH] * Support setting postPhases. svn path=/nixpkgs/trunk/; revision=33247 --- pkgs/build-support/release/nix-build.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 7e2a0d4f03b9..a8973b9d779b 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -13,6 +13,7 @@ , src, stdenv , name ? if doCoverageAnalysis then "nix-coverage" else "nix-build" , failureHook ? null +, postPhases ? [] , ... } @ args: stdenv.mkDerivation ( @@ -26,9 +27,6 @@ stdenv.mkDerivation ( showBuildStats = true; - postPhases = - (stdenv.lib.optional doCoverageAnalysis "coverageReportPhase") ++ ["finalPhase"]; - finalPhase = '' # Propagate the release name of the source tarball. This is @@ -105,6 +103,9 @@ stdenv.mkDerivation ( inherit lcovExtraTraceFiles; + postPhases = postPhases ++ + (stdenv.lib.optional doCoverageAnalysis "coverageReportPhase") ++ ["finalPhase"]; + meta = (if args ? meta then args.meta else {}) // { description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}"; };