summary refs log tree commit diff
diff options
context:
space:
mode:
authorPavol Rusnak <pavol@rusnak.io>2020-06-14 00:19:11 +0200
committerPavol Rusnak <pavol@rusnak.io>2020-06-14 00:19:11 +0200
commit490fc040be1c85ab7f61fa72e0cb4cc1a5adec7c (patch)
treed3c61dee0645a0bacc967b7d565d9d2cb3c40ca6
parent2cb97c36ae153c8d3d83aa115943a6c4fabbab9d (diff)
downloadnixpkgs-490fc040be1c85ab7f61fa72e0cb4cc1a5adec7c.tar
nixpkgs-490fc040be1c85ab7f61fa72e0cb4cc1a5adec7c.tar.gz
nixpkgs-490fc040be1c85ab7f61fa72e0cb4cc1a5adec7c.tar.bz2
nixpkgs-490fc040be1c85ab7f61fa72e0cb4cc1a5adec7c.tar.lz
nixpkgs-490fc040be1c85ab7f61fa72e0cb4cc1a5adec7c.tar.xz
nixpkgs-490fc040be1c85ab7f61fa72e0cb4cc1a5adec7c.tar.zst
nixpkgs-490fc040be1c85ab7f61fa72e0cb4cc1a5adec7c.zip
images: remove original files when using zstd for compression
-rw-r--r--nixos/lib/make-iso9660-image.sh2
-rw-r--r--nixos/modules/installer/cd-dvd/sd-image.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh
index eb9edcd7026..d64fe9a365e 100644
--- a/nixos/lib/make-iso9660-image.sh
+++ b/nixos/lib/make-iso9660-image.sh
@@ -129,7 +129,7 @@ fi
 
 if test -n "$compressImage"; then
     echo "Compressing image..."
-    zstd -T$NIX_BUILD_CORES $out/iso/$isoName
+    zstd -T$NIX_BUILD_CORES --rm $out/iso/$isoName
 fi
 
 mkdir -p $out/nix-support
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index 589bf74263b..98c12e30633 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -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
-            zstd -T$NIX_BUILD_CORES $img
+            zstd -T$NIX_BUILD_CORES --rm $img
         fi
       '';
     }) {};