summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmily Trau <emily@downunderctf.com>2023-09-25 02:10:10 -0700
committerEmily Trau <emily@downunderctf.com>2023-09-26 22:20:36 -0700
commitee8bf1d3effd139508db98ed3fb2ad4da2a59fa7 (patch)
treed5b736211db8316e6ed7a7c5e7cd5e7af632b2b9
parentminimal-bootstrap.gawk: 5.2.0 -> 5.2.2, parallelise (diff)
downloadnixpkgs-ee8bf1d3effd139508db98ed3fb2ad4da2a59fa7.tar.gz
minimal-bootstrap.xz: parallelise
-rw-r--r--pkgs/os-specific/linux/minimal-bootstrap/default.nix2
-rw-r--r--pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix4
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix
index 5a7f31949073..f600ec0404e3 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix
@@ -172,6 +172,8 @@ lib.makeScope
xz = callPackage ./xz {
bash = bash_2_05;
tinycc = tinycc-musl;
+ gnumake = gnumake-musl;
+ gnutar = gnutar-musl;
};
inherit (callPackage ./utils.nix { }) derivationWithMeta writeTextFile writeText;
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix
index a7eb8478d5ac..8dcccbacaca8 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix
@@ -63,8 +63,8 @@ bash.runCommand "${pname}-${version}" {
--disable-assembler
# Build
- make
+ make -j $NIX_BUILD_CORES
# Install
- make install
+ make -j $NIX_BUILD_CORES install
''