diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-13 13:53:41 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-13 13:54:32 +0100 |
| commit | a0a6f0edfd5e304f00a44c98dc03898b2fa8b2c2 (patch) | |
| tree | 966f64042805966dfff71ec0506d34185adf9ed6 /pkgs/build-support/release | |
| parent | 7d5936856af03100e5824304d06d84414d1b9465 (diff) | |
releaseTools.nixBuild: Support builds with multiple outputs
Diffstat (limited to 'pkgs/build-support/release')
| -rw-r--r-- | pkgs/build-support/release/nix-build.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 336563ae285f..a107e6522913 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -46,17 +46,17 @@ stdenv.mkDerivation ( header "Copying build directory to $KEEPBUILDDIR" mkdir -p $KEEPBUILDDIR cp -R $TMPDIR/* $KEEPBUILDDIR - stopNest + stopNest fi fi ''; } - // args // + // args // { name = name + (if src ? version then "-" + src.version else ""); - + postHook = '' . ${./functions.sh} origSrc=$src @@ -75,7 +75,10 @@ stdenv.mkDerivation ( echo "$system" > $out/nix-support/system if [ -z "${toString doCoverageAnalysis}" ]; then - echo "nix-build none $out" >> $out/nix-support/hydra-build-products + for i in $outputs; do + if [ "$i" = out ]; then j=none; else j="$i"; fi + echo "nix-build $j ''${!i}" >> $out/nix-support/hydra-build-products + done fi ''; |