Unverified Commit b5a94451 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #256709 from colemickens/make-squashfs-skip-compression 

nixos/lib/make-squashfs.nix: allow disabling compression
parents 16b9142e 5a718794

nixos/lib/make-squashfs.nix

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


let

  pseudoFilesArgs = lib.concatMapStrings (f: ''-p "${f}" '') pseudoFiles;

  compFlag = if comp == null then "-no-compression" else "-comp ${comp}";

in

stdenv.mkDerivation {

  name = "${fileName}.img";
@@ -39,7 +40,7 @@ stdenv.mkDerivation { 


      # Generate the squashfs image.

      mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out ${pseudoFilesArgs} \

        -no-hardlinks ${lib.optionalString noStrip "-no-strip"} -keep-as-directory -all-root -b 1048576 -comp ${comp} \

        -no-hardlinks ${lib.optionalString noStrip "-no-strip"} -keep-as-directory -all-root -b 1048576 ${compFlag} \

        -processors $NIX_BUILD_CORES

    '';

}

nixos/modules/installer/cd-dvd/iso-image.nix

+2 −1
Original line number Diff line number Diff line
@@ -512,9 +512,10 @@ in 
                + lib.optionalString isAarch "-Xbcj arm"

                + lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"

                + lib.optionalString (isSparc) "-Xbcj sparc";

      type = lib.types.str;

      type = lib.types.nullOr lib.types.str;

      description = lib.mdDoc ''

        Compression settings to use for the squashfs nix store.

        `null` disables compression.

      '';

      example = "zstd -Xcompression-level 6";

    };