nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

minimal-bootstrap.*: replace uses of musl11 with tinycc-musl.libs

Browse Source
This commit is contained in:
Emily Trau 2023-09-21 22:29:10 -07:00
parent 3e95cadee8
commit c9ba05b20d
6 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix
View File

@ -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"

5
pkgs/os-specific/linux/minimal-bootstrap/default.nix
View File

@ -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;

3
pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix
View File

@ -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 \

3
pkgs/os-specific/linux/minimal-bootstrap/findutils/default.nix
View File

@ -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 \

3
pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix
View File

@ -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} \

3
pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix
View File

@ -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 \