movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Combine ISO generation steps

Browse source 
This folds adding hydra-build-products into the actual ISO generation,
preventing an unnecessary download of the ISO.
This commit is contained in:
Eelco Dolstra 2016-03-15 13:48:45 +01:00
parent 5cc7bcda30
commit 10293b87a9
3 changed files with 7 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixos/lib/make-iso9660-image.nix
View file

@ -39,7 +39,6 @@
, # The volume ID.
volumeID ? ""
}:
assert bootable -> bootImage != "";
@ -47,7 +46,7 @@ assert efiBootable -> efiBootImage != "";
assert usbBootable -> isohybridMbrImage != "";
stdenv.mkDerivation {
name = "iso9660-image";
name = isoName;
builder = ./make-iso9660-image.sh;
buildInputs = [perl xorriso syslinux];

1
nixos/lib/make-iso9660-image.sh
View file

@ -133,3 +133,4 @@ fi
mkdir -p $out/nix-support
echo $system > $out/nix-support/system
echo "file iso $out/iso/$isoName" >> $out/nix-support/hydra-build-products