summary refs log tree commit diff
path: root/nixos/lib/make-system-tarball.sh
diff options
context:
space:
mode:
authorMichael Bishop2018-03-17 21:26:42 -0300
committerMichael Bishop2018-04-03 11:30:43 -0300
commit3c9e579d1ebdca423766983c3e8fec7ba56407c3 (patch)
tree8ef5d66e1fe48c448d894d648684ec86a7b725a2 /nixos/lib/make-system-tarball.sh
parent26db7314c85962ac241944a118033f6e8e5ccf4c (diff)
make-system-tarball: allow alternate compression methods
Diffstat (limited to 'nixos/lib/make-system-tarball.sh')
-rw-r--r--nixos/lib/make-system-tarball.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh
index 73a009d8488a..1a52a284a257 100644
--- a/nixos/lib/make-system-tarball.sh
+++ b/nixos/lib/make-system-tarball.sh
@@ -1,5 +1,4 @@
 source $stdenv/setup
-set -x
 
 sources_=($sources)
 targets_=($targets)
@@ -54,8 +53,8 @@ mkdir -p $out/tarball
 
 rm env-vars
 
-tar --sort=name --mtime='@1' --owner=0 --group=0 --numeric-owner -cvJf $out/tarball/$fileName.tar.xz * $extraArgs
+time tar --sort=name --mtime='@1' --owner=0 --group=0 --numeric-owner -c * $extraArgs | $compressCommand > $out/tarball/$fileName.tar${extension}
 
 mkdir -p $out/nix-support
 echo $system > $out/nix-support/system
-echo "file system-tarball $out/tarball/$fileName.tar.xz" > $out/nix-support/hydra-build-products
+echo "file system-tarball $out/tarball/$fileName.tar${extension}" > $out/nix-support/hydra-build-products