Unverified Commit b67d4972 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

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

minimal-bootstrap.bash{,_2_05}: Normalize the NIX_BUILD_CORES variable
parents 4a644c17 4f62cc03

pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix

+11 −0
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -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

+0 −3
Original line number Diff line number Diff line
@@ -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;