diff options
author | Emily Trau <emily@downunderctf.com> | 2023-09-21 22:29:10 -0700 |
---|---|---|
committer | Emily Trau <emily@downunderctf.com> | 2023-09-26 22:20:35 -0700 |
commit | c9ba05b20da750f3924e6f7d3aa1fb6fe8376c4c (patch) | |
tree | a4f466cea8602c4877201bbbca49c7f5bfc5bd09 /pkgs/os-specific | |
parent | 3e95cadee893e998f2f53ef688fffd6493c06f5b (diff) |
minimal-bootstrap.*: replace uses of musl11 with tinycc-musl.libs
Diffstat (limited to 'pkgs/os-specific')
6 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix index fedb6fd22638f..7afec17d3c6e4 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix @@ -13,7 +13,6 @@ , gnutar , xz , tinycc -, musl }: let @@ -99,7 +98,7 @@ bash.runCommand "${pname}-${version}" { export PATH="$(pwd)/aliases/:$PATH" # Configure - export CC="tcc -B ${musl}/lib" + export CC="tcc -B ${tinycc.libs}/lib" export AR="tcc -ar" export lt_cv_sys_max_cmd_len=32768 export CFLAGS="-D__LITTLE_ENDIAN__=1" diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index 7dee2e8064451..fc6b2b67cad6e 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -24,7 +24,6 @@ lib.makeScope binutils = callPackage ./binutils { bash = bash_2_05; tinycc = tinycc-musl; - musl = musl11; }; bzip2 = callPackage ./bzip2 { @@ -37,13 +36,11 @@ lib.makeScope diffutils = callPackage ./diffutils { bash = bash_2_05; tinycc = tinycc-musl; - musl = musl11; }; findutils = callPackage ./findutils { bash = bash_2_05; tinycc = tinycc-musl; - musl = musl11; }; gawk-mes = callPackage ./gawk/mes.nix { @@ -98,7 +95,6 @@ lib.makeScope gnused = callPackage ./gnused { bash = bash_2_05; tinycc = tinycc-musl; - musl = musl11; gnused = gnused-mes; }; gnused-mes = callPackage ./gnused/mes.nix { @@ -157,7 +153,6 @@ lib.makeScope xz = callPackage ./xz { bash = bash_2_05; tinycc = tinycc-musl; - musl = musl11; }; inherit (callPackage ./utils.nix { }) derivationWithMeta writeTextFile writeText; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix index 42db4a6640da9..b0cacd0ac4f5b 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix @@ -4,7 +4,6 @@ , fetchurl , bash , tinycc -, musl , gnumake , gnugrep , gnused @@ -57,7 +56,7 @@ bash.runCommand "${pname}-${version}" { cd diffutils-${version} # Configure - export CC="tcc -B ${musl}/lib" + export CC="tcc -B ${tinycc.libs}/lib" export LD=tcc bash ./configure \ --prefix=$out \ diff --git a/pkgs/os-specific/linux/minimal-bootstrap/findutils/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/findutils/default.nix index bbdc4198d703c..7479ea6fbfbfc 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/findutils/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/findutils/default.nix @@ -4,7 +4,6 @@ , fetchurl , bash , tinycc -, musl , gnumake , gnugrep , gnused @@ -60,7 +59,7 @@ bash.runCommand "${pname}-${version}" { sed -i 's/chdir_long/chdir/' gl/lib/save-cwd.c # Configure - export CC="tcc -B ${musl}/lib" + export CC="tcc -B ${tinycc.libs}/lib" export AR="tcc -ar" export LD=tcc bash ./configure \ diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix index ee237f016f5b8..ee566f93c1643 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix @@ -5,7 +5,6 @@ , bash , gnumake , tinycc -, musl , gnused , gnugrep , gnutar @@ -46,7 +45,7 @@ bash.runCommand "${pname}-${version}" { cd sed-${version} # Configure - export CC="tcc -B ${musl}/lib" + export CC="tcc -B ${tinycc.libs}/lib" export LD=tcc ./configure \ --build=${buildPlatform.config} \ diff --git a/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix index 32c5b3999c1b7..a7eb8478d5acd 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix @@ -4,7 +4,6 @@ , fetchurl , bash , tinycc -, musl , gnumake , gnused , gnugrep @@ -53,7 +52,7 @@ bash.runCommand "${pname}-${version}" { cd xz-${version} # Configure - export CC="tcc -B ${musl}/lib" + export CC="tcc -B ${tinycc.libs}/lib" export AR="tcc -ar" export LD=tcc bash ./configure \ |