From cd2c0b26ade6c2154405921485042f7e3b03be09 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 17 Jun 2009 07:02:59 +0000 Subject: [PATCH] moved finalPhase so it is possible to override through args svn path=/nixpkgs/trunk/; revision=15977 --- pkgs/build-support/release/nix-build.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 703dc07a6e44..db005dbd052d 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -24,6 +24,15 @@ stdenv.mkDerivation ( # Hack - swap checkPhase and installPhase (otherwise Stratego barfs). phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase ${if doCoverageAnalysis then "coverageReportPhase" else ""} finalPhase"; + + finalPhase = + '' + # Propagate the release name of the source tarball. This is + # to get nice package names in channels. + if test -e $origSrc/nix-support/hydra-release-name; then + cp $origSrc/nix-support/hydra-release-name $out/nix-support/hydra-release-name + fi + ''; } // args // @@ -77,16 +86,6 @@ stdenv.mkDerivation ( lcovFilter = ["/nix/store/*"] ++ lcovFilter; - finalPhase = - '' - # Propagate the release name of the source tarball. This is - # to get nice package names in channels. - if test -e $origSrc/nix-support/hydra-release-name; then - cp $origSrc/nix-support/hydra-release-name $out/nix-support/hydra-release-name - fi - ''; - - meta = (if args ? meta then args.meta else {}) // { description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}"; };