gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #262847 from emilytrau/minimal-nix-cores

Browse Source 
minimal-bootstrap.bash{,_2_05}: Normalize the NIX_BUILD_CORES variable
This commit is contained in:
John Ericson
2023-10-31 11:09:07 -04:00
committed by GitHub
parent 4a644c17c0 4f62cc0388
commit b67d497260
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix
+11
View File
@@ -84,6 +84,17 @@ kaem.runCommand "${pname}-${version}" {
"-e"
(builtins.toFile "bash-builder.sh" ''
export CONFIG_SHELL=$SHELL
# Normalize the NIX_BUILD_CORES variable. The value might be 0, which
# means that we're supposed to try and auto-detect the number of
# available CPU cores at run-time. We don't have nproc to detect the
# number of available CPU cores so default to 1 if not set.
NIX_BUILD_CORES="''${NIX_BUILD_CORES:-1}"
if [ $NIX_BUILD_CORES -le 0 ]; then
NIX_BUILD_CORES=1
fi
export NIX_BUILD_CORES
bash -eux $buildCommandPath
'')
];
pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix
+11
View File
@@ -54,6 +54,17 @@ bootBash.runCommand "${pname}-${version}" {
"-e"
(builtins.toFile "bash-builder.sh" ''
export CONFIG_SHELL=$SHELL
# Normalize the NIX_BUILD_CORES variable. The value might be 0, which
# means that we're supposed to try and auto-detect the number of
# available CPU cores at run-time.
NIX_BUILD_CORES="''${NIX_BUILD_CORES:-1}"
if ((NIX_BUILD_CORES <= 0)); then
guess=$(nproc 2>/dev/null || true)
((NIX_BUILD_CORES = guess <= 0 ? 1 : guess))
fi
export NIX_BUILD_CORES
bash -eux $buildCommandPath
'')
];
pkgs/os-specific/linux/minimal-bootstrap/default.nix
-3
View File
@@ -24,14 +24,12 @@ lib.makeScope
};
binutils = callPackage ./binutils {
bash = bash_2_05;
tinycc = tinycc-musl;
gnumake = gnumake-musl;
gnutar = gnutar-musl;
};
bzip2 = callPackage ./bzip2 {
bash = bash_2_05;
tinycc = tinycc-musl;
gnumake = gnumake-musl;
gnutar = gnutar-musl;
@@ -53,7 +51,6 @@ lib.makeScope
};
findutils = callPackage ./findutils {
bash = bash_2_05;
tinycc = tinycc-musl;
gnumake = gnumake-musl;
gnutar = gnutar-musl;