Author: eelco
Date: Mon Mar 19 02:45:52 2012
New Revision: 33247
URL: https://nixos.org/websvn/nix/?rev=33247&sc=1
Log:
* Support setting postPhases.
Modified:
nixpkgs/trunk/pkgs/build-support/release/nix-build.nix
Modified: nixpkgs/trunk/pkgs/build-support/release/nix-build.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/release/nix-build.nix Mon Mar 19
02:35:17 2012 (r33246)
+++ nixpkgs/trunk/pkgs/build-support/release/nix-build.nix Mon Mar 19
02:45:52 2012 (r33247)
@@ -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 @@
showBuildStats = true;
- postPhases =
- (stdenv.lib.optional doCoverageAnalysis "coverageReportPhase") ++
["finalPhase"];
-
finalPhase =
''
# Propagate the release name of the source tarball. This is
@@ -105,6 +103,9 @@
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}";
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
