public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

releaseTools.nixBuild: Support builds with multiple outputs

Browse Source
This commit is contained in:
Eelco Dolstra 2013-02-13 13:53:41 +01:00
parent 7d5936856a
commit a0a6f0edfd
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/build-support/release/nix-build.nix
View File

@ -46,17 +46,17 @@ stdenv.mkDerivation (
header "Copying build directory to $KEEPBUILDDIR" header "Copying build directory to $KEEPBUILDDIR"
mkdir -p $KEEPBUILDDIR mkdir -p $KEEPBUILDDIR
cp -R $TMPDIR/* $KEEPBUILDDIR cp -R $TMPDIR/* $KEEPBUILDDIR
stopNest stopNest
fi fi
fi fi
''; '';
} }
// args // // args //
{ {
name = name + (if src ? version then "-" + src.version else ""); name = name + (if src ? version then "-" + src.version else "");
postHook = '' postHook = ''
. ${./functions.sh} . ${./functions.sh}
origSrc=$src origSrc=$src
@ -75,7 +75,10 @@ stdenv.mkDerivation (
echo "$system" > $out/nix-support/system echo "$system" > $out/nix-support/system
if [ -z "${toString doCoverageAnalysis}" ]; then 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 fi
''; '';