diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2020-04-24 18:12:42 +0200 |
---|---|---|
committer | Pavol Rusnak <pavol@rusnak.io> | 2020-04-24 18:34:11 +0200 |
commit | f20fd89fc02454f41ec4844c3ddf03b7edbe2639 (patch) | |
tree | 5bbc7548bf09a0d5501d0fe0d7f05b7b31ec15a0 /nixos/lib | |
parent | c09ffc7a5584ac3f9fbf0cee3e0e6f6596a6ed37 (diff) | |
download | nixlib-f20fd89fc02454f41ec4844c3ddf03b7edbe2639.tar nixlib-f20fd89fc02454f41ec4844c3ddf03b7edbe2639.tar.gz nixlib-f20fd89fc02454f41ec4844c3ddf03b7edbe2639.tar.bz2 nixlib-f20fd89fc02454f41ec4844c3ddf03b7edbe2639.tar.lz nixlib-f20fd89fc02454f41ec4844c3ddf03b7edbe2639.tar.xz nixlib-f20fd89fc02454f41ec4844c3ddf03b7edbe2639.tar.zst nixlib-f20fd89fc02454f41ec4844c3ddf03b7edbe2639.zip |
iso-image: use zstd for compression
Diffstat (limited to 'nixos/lib')
-rw-r--r-- | nixos/lib/make-iso9660-image.nix | 4 | ||||
-rw-r--r-- | nixos/lib/make-iso9660-image.sh | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 0f3f2b5b5234..be8ad9912db0 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -34,7 +34,7 @@ , # The path (outside the ISO file system) of the isohybrid-mbr image. isohybridMbrImage ? "" -, # Whether to compress the resulting ISO image with bzip2. +, # Whether to compress the resulting ISO image with zstd. compressImage ? false , # The volume ID. @@ -48,7 +48,7 @@ assert usbBootable -> isohybridMbrImage != ""; stdenv.mkDerivation { name = isoName; builder = ./make-iso9660-image.sh; - buildInputs = [ xorriso syslinux ]; + buildInputs = [ xorriso syslinux zstd ]; inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable; diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index d4633d2c8d16..eb9edcd70269 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -129,9 +129,14 @@ fi if test -n "$compressImage"; then echo "Compressing image..." - bzip2 $out/iso/$isoName + zstd -T$NIX_BUILD_CORES $out/iso/$isoName fi mkdir -p $out/nix-support echo $system > $out/nix-support/system -echo "file iso $out/iso/$isoName" >> $out/nix-support/hydra-build-products + +if test -n "$compressImage"; then + echo "file iso $out/iso/$isoName.zst" >> $out/nix-support/hydra-build-products +else + echo "file iso $out/iso/$isoName" >> $out/nix-support/hydra-build-products +fi |