diff options
| author | happysalada <raphael@megzari.com> | 2021-09-06 12:13:43 +0900 |
|---|---|---|
| committer | Raphael Megzari <raphael@megzari.com> | 2021-09-07 00:36:55 +0900 |
| commit | 4c92bb8bdf2a95c5c9028785cf9d4964fd5a13fd (patch) | |
| tree | 44c0614aeb50e23e9fb02153ec6cf356d9637173 /pkgs/stdenv | |
| parent | 95a966c5b2d3460467c029de29274cba684c3cb1 (diff) | |
| download | nixpkgs-4c92bb8bdf2a95c5c9028785cf9d4964fd5a13fd.tar nixpkgs-4c92bb8bdf2a95c5c9028785cf9d4964fd5a13fd.tar.gz nixpkgs-4c92bb8bdf2a95c5c9028785cf9d4964fd5a13fd.tar.bz2 nixpkgs-4c92bb8bdf2a95c5c9028785cf9d4964fd5a13fd.tar.lz nixpkgs-4c92bb8bdf2a95c5c9028785cf9d4964fd5a13fd.tar.xz nixpkgs-4c92bb8bdf2a95c5c9028785cf9d4964fd5a13fd.tar.zst nixpkgs-4c92bb8bdf2a95c5c9028785cf9d4964fd5a13fd.zip | |
stdenv: fix nix_build_cores guess
- use builtin arithmetic instead of external expr - simplify logic with bash builtins
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 29c44e9d711..2d2a085ef93 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -658,15 +658,10 @@ export NIX_INDENT_MAKE=1 # means that we're supposed to try and auto-detect the number of # available CPU cores at run-time. -if [ -z "${NIX_BUILD_CORES:-}" ]; then - NIX_BUILD_CORES="1" -elif (( NIX_BUILD_CORES <= 0 )); then - NIX_BUILD_CORES=$(nproc 2>/dev/null || true) - if expr >/dev/null 2>&1 "$NIX_BUILD_CORES" : "^[0-9][0-9]*$"; then - : - else - NIX_BUILD_CORES="1" - fi +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 |