diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-15 13:48:45 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-15 14:15:12 +0100 |
| commit | 10293b87a9da30631b49b11b56cd8a55dd3c7896 (patch) | |
| tree | d45a287f980104faa0729631f604b3cef6bd53db /nixos/lib | |
| parent | 5cc7bcda3023b01bd926eccd0c5f095a050c5ab0 (diff) | |
Combine ISO generation steps
This folds adding hydra-build-products into the actual ISO generation,
preventing an unnecessary download of the ISO.
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/make-iso9660-image.nix | 3 | ||||
| -rw-r--r-- | nixos/lib/make-iso9660-image.sh | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 21c9cca316d1..75be70dbcb2b 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -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]; diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index 31bfe23d3d4a..c623436f6c5b 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -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 |