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

Merge pull request #85947 from prusnak/images-zstd

Browse Source 
Use zstd for ISO and SD images
This commit is contained in:
Marek Mahut
2020-06-07 19:09:43 +02:00
committed by GitHub
parent 410ac11287 99f4ca8bf8
commit 7b9d7cc05d
6 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/lib/make-iso9660-image.nix
View File

@@ -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;

9
nixos/lib/make-iso9660-image.sh
View File

@@ -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