diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2020-04-24 15:38:01 +0200 |
---|---|---|
committer | Pavol Rusnak <pavol@rusnak.io> | 2020-04-24 18:14:07 +0200 |
commit | c09ffc7a5584ac3f9fbf0cee3e0e6f6596a6ed37 (patch) | |
tree | 6c5b0ac60d88df23bb7c4b43663af610dc2ee472 /nixos/modules/installer/cd-dvd | |
parent | a9a38f9ad220405ec7b90fdbf8583de556ee5bd9 (diff) | |
download | nixpkgs-c09ffc7a5584ac3f9fbf0cee3e0e6f6596a6ed37.tar nixpkgs-c09ffc7a5584ac3f9fbf0cee3e0e6f6596a6ed37.tar.gz nixpkgs-c09ffc7a5584ac3f9fbf0cee3e0e6f6596a6ed37.tar.bz2 nixpkgs-c09ffc7a5584ac3f9fbf0cee3e0e6f6596a6ed37.tar.lz nixpkgs-c09ffc7a5584ac3f9fbf0cee3e0e6f6596a6ed37.tar.xz nixpkgs-c09ffc7a5584ac3f9fbf0cee3e0e6f6596a6ed37.tar.zst nixpkgs-c09ffc7a5584ac3f9fbf0cee3e0e6f6596a6ed37.zip |
sd-image: use zstd for compression
Diffstat (limited to 'nixos/modules/installer/cd-dvd')
-rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 901c60befb6..732319b654d 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -105,7 +105,7 @@ in default = true; description = '' Whether the SD image should be compressed using - <command>bzip2</command>. + <command>zstd</command>. ''; }; @@ -130,10 +130,10 @@ in sdImage.storePaths = [ config.system.build.toplevel ]; system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, - mtools, libfaketime, utillinux, bzip2, zstd }: stdenv.mkDerivation { + mtools, libfaketime, utillinux, zstd }: stdenv.mkDerivation { name = config.sdImage.imageName; - nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux bzip2 zstd ]; + nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux zstd ]; inherit (config.sdImage) compressImage; @@ -143,7 +143,7 @@ in echo "${pkgs.stdenv.buildPlatform.system}" > $out/nix-support/system if test -n "$compressImage"; then - echo "file sd-image $img.bz2" >> $out/nix-support/hydra-build-products + echo "file sd-image $img.zst" >> $out/nix-support/hydra-build-products else echo "file sd-image $img" >> $out/nix-support/hydra-build-products fi @@ -190,7 +190,7 @@ in fsck.vfat -vn firmware_part.img dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS if test -n "$compressImage"; then - bzip2 $img + zstd -T$NIX_BUILD_CORES $img fi ''; }) {}; |