diff options
| author | Emily Trau <emily@downunderctf.com> | 2023-09-25 00:26:04 -0700 |
|---|---|---|
| committer | Emily Trau <emily@downunderctf.com> | 2023-09-26 22:20:35 -0700 |
| commit | 454dc76ae85b9db28430a95171c08aa1fa81f19e (patch) | |
| tree | e2872b0d4d266e78090f7bf65c17534220fb3499 | |
| parent | minimal-bootstrap.bash: build with musl (diff) | |
| download | nixpkgs-454dc76ae85b9db28430a95171c08aa1fa81f19e.tar.gz | |
minimal-bootstrap.gawk: 5.2.0 -> 5.2.2, parallelise
| -rw-r--r-- | pkgs/os-specific/linux/minimal-bootstrap/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/minimal-bootstrap/gawk/default.nix | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index d0eed2f87aaf..5a7f31949073 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -60,6 +60,8 @@ lib.makeScope gawk = callPackage ./gawk { bash = bash_2_05; tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; bootGawk = gawk-mes; }; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gawk/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gawk/default.nix index d7d603f9dc86..879b98bf00c5 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gawk/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gawk/default.nix @@ -14,11 +14,11 @@ let inherit (import ./common.nix { inherit lib; }) meta; pname = "gawk"; - version = "5.2.0"; + version = "5.2.2"; src = fetchurl { url = "mirror://gnu/gawk/gawk-${version}.tar.gz"; - hash = "sha256-71r0RJywJp+vOvJL9MAic9RV8HQb88UPht3AkzLWz1Y="; + hash = "sha256-lFrvfM/xAfILIqEIArwAXplKsrjqPnJMwaGXxi9B9lA="; }; in bash.runCommand "${pname}-${version}" { @@ -54,8 +54,8 @@ bash.runCommand "${pname}-${version}" { --host=${hostPlatform.config} # Build - make + make -j $NIX_BUILD_CORES # Install - make install + make -j $NIX_BUILD_CORES install '' |