summary refs log tree commit diff
diff options
context:
space:
mode:
authorArtturin <Artturin@artturin.com>2023-08-19 23:33:55 +0300
committerArtturin <Artturin@artturin.com>2023-08-19 23:40:07 +0300
commit91dd8b932457a45f08be3d4d355c12cbb1703774 (patch)
treead41b6fd4dfb6e35d0eff63c98ef058dbf072a6b
parent43fd3a94bb44205bcbf5f290b1990e5ab9c9699f (diff)
downloadnixpkgs-91dd8b932457a45f08be3d4d355c12cbb1703774.tar
nixpkgs-91dd8b932457a45f08be3d4d355c12cbb1703774.tar.gz
nixpkgs-91dd8b932457a45f08be3d4d355c12cbb1703774.tar.bz2
nixpkgs-91dd8b932457a45f08be3d4d355c12cbb1703774.tar.lz
nixpkgs-91dd8b932457a45f08be3d4d355c12cbb1703774.tar.xz
nixpkgs-91dd8b932457a45f08be3d4d355c12cbb1703774.tar.zst
nixpkgs-91dd8b932457a45f08be3d4d355c12cbb1703774.zip
make-squashfs: Only limit cores to 48 on i686
There shouldn't be a need to limit it on other systems
-rw-r--r--nixos/lib/make-squashfs.nix4
1 files changed, 3 insertions, 1 deletions
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 \