From 91dd8b932457a45f08be3d4d355c12cbb1703774 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 19 Aug 2023 23:33:55 +0300 Subject: make-squashfs: Only limit cores to 48 on i686 There shouldn't be a need to limit it on other systems --- nixos/lib/make-squashfs.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index d1260a48f22..b7c7078b73b 100644 --- a/nixos/lib/make-squashfs.nix +++ b/nixos/lib/make-squashfs.nix @@ -1,4 +1,4 @@ -{ stdenv, squashfsTools, closureInfo +{ lib, stdenv, squashfsTools, closureInfo , # The root directory of the squashfs filesystem is filled with the # closures of the Nix store paths listed here. @@ -22,11 +22,13 @@ stdenv.mkDerivation { # for nix-store --load-db. cp $closureInfo/registration nix-path-registration + '' + lib.optionalString stdenv.buildPlatform.is32bit '' # 64 cores on i686 does not work # fails with FATAL ERROR: mangle2:: xz compress failed with error code 5 if ((NIX_BUILD_CORES > 48)); then NIX_BUILD_CORES=48 fi + '' + '' # Generate the squashfs image. mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \ -- cgit 1.4.1