From f98df44ada189bfaecb695850b066c0c0c9a1a3b Mon Sep 17 00:00:00 2001 From: Alexander Kjeldaas Date: Sun, 13 Apr 2014 22:15:04 +0200 Subject: [PATCH] Eradicate gzip -9 without -n --- nixos/modules/system/boot/stage-1.nix | 2 +- pkgs/development/compilers/qcmm/builder.sh | 2 +- pkgs/os-specific/linux/multipath-tools/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index cd30ce1b7cef..f0d8b04d0875 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -326,7 +326,7 @@ in boot.initrd.compressor = mkOption { internal = true; - default = "gzip -9"; + default = "gzip -9n"; type = types.str; description = "The compressor to use on the initrd image."; example = "xz"; diff --git a/pkgs/development/compilers/qcmm/builder.sh b/pkgs/development/compilers/qcmm/builder.sh index c6aa18fea3c8..acdfbaa08dce 100644 --- a/pkgs/development/compilers/qcmm/builder.sh +++ b/pkgs/development/compilers/qcmm/builder.sh @@ -16,7 +16,7 @@ installPhase() { mv $file ${file%.opt} done - find $out/man -type f -exec gzip -9 {} \; + find $out/man -type f -exec gzip -9n {} \; find $out -name \*.a -exec echo stripping {} \; \ -exec strip -S {} \; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 90722d74ace1..3da37a89923a 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { preBuild = '' - makeFlagsArray=(GZIP="${gzip}/bin/gzip -9 -c" prefix=$out mandir=$out/share/man/man8 man5dir=$out/share/man/man5 LIB=lib) + makeFlagsArray=(GZIP="${gzip}/bin/gzip -9n -c" prefix=$out mandir=$out/share/man/man8 man5dir=$out/share/man/man5 LIB=lib) substituteInPlace multipath/Makefile --replace /etc $out/etc substituteInPlace kpartx/Makefile --replace /etc $out/etc