diff options
| author | Emily Trau <emily@downunderctf.com> | 2023-09-21 22:07:51 -0700 |
|---|---|---|
| committer | Emily Trau <emily@downunderctf.com> | 2023-09-26 22:20:35 -0700 |
| commit | a5d9d1cf496be8e19c3652e9df03eaea6ecea60b (patch) | |
| tree | 0b7ec39a4be14616a09faa947bdcd70ef90293a3 | |
| parent | minimal-bootstrap.musl11: always flush stdio (diff) | |
| download | nixpkgs-a5d9d1cf496be8e19c3652e9df03eaea6ecea60b.tar.gz | |
minimal-bootstrap.gawk: use libs from tinycc-musl
| -rw-r--r-- | pkgs/os-specific/linux/minimal-bootstrap/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/minimal-bootstrap/gawk/default.nix | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index ab85800af469..730bcad27618 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -55,7 +55,6 @@ lib.makeScope gawk = callPackage ./gawk { bash = bash_2_05; tinycc = tinycc-musl; - musl = musl11; 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 83a76c73b4ae..d7d603f9dc86 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gawk/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gawk/default.nix @@ -4,7 +4,6 @@ , fetchurl , bash , tinycc -, musl , gnumake , gnugrep , gnused @@ -46,7 +45,7 @@ bash.runCommand "${pname}-${version}" { cd gawk-${version} # Configure - export CC="tcc -B ${musl}/lib" + export CC="tcc -B ${tinycc.libs}/lib" export AR="tcc -ar" export LD=tcc bash ./configure \ |