summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtturin <Artturin@artturin.com>2021-12-08 18:26:08 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-12-08 18:24:27 +0000
commit5dbf874b688c038711cbdf1003fe2521990b169b (patch)
treef168dda0895739a42d7ce9272477c94daa44328e
parentMerge pull request #149683 from NixOS/backport-149650-to-release-21.11 (diff)
downloadnixpkgs-5dbf874b688c038711cbdf1003fe2521990b169b.tar.gz
make-squashfs: use $NIX_BUILD_CORES or 48 cores if above 48
by default all cores are used hoping this will fix the hydra i686 squashfs build issues as all the failures were using 64 cores Parallel mksquashfs: Using 64 processors Creating 4.0 filesystem on ..., block size 1048576. FATAL ERROR: mangle2:: xz compress failed with error code 5 (cherry picked from commit eea6baad509b24c9137fd9d97fd3ae9392cf34de)
-rw-r--r--nixos/lib/make-squashfs.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix
index 8690c42e7ac9..170d315fb751 100644
--- a/nixos/lib/make-squashfs.nix
+++ b/nixos/lib/make-squashfs.nix
@@ -21,8 +21,15 @@ stdenv.mkDerivation {
# for nix-store --load-db.
cp $closureInfo/registration nix-path-registration
+ # 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 \
- -no-hardlinks -keep-as-directory -all-root -b 1048576 -comp ${comp}
+ -no-hardlinks -keep-as-directory -all-root -b 1048576 -comp ${comp} \
+ -processors $NIX_BUILD_CORES
'';
}