diff options
| author | Emily Trau <emily@downunderctf.com> | 2023-09-18 19:34:49 -0700 |
|---|---|---|
| committer | Emily Trau <emily@downunderctf.com> | 2023-09-26 22:20:34 -0700 |
| commit | 20e65d89e60d3667c529cbfb73772220046d18c1 (patch) | |
| tree | 20ed86320715dbcdced604d043198f9aa989a0c9 | |
| parent | 665d36050736d95904c689940e64aea00350b887 (diff) | |
| download | nixpkgs-20e65d89e60d3667c529cbfb73772220046d18c1.tar nixpkgs-20e65d89e60d3667c529cbfb73772220046d18c1.tar.gz nixpkgs-20e65d89e60d3667c529cbfb73772220046d18c1.tar.bz2 nixpkgs-20e65d89e60d3667c529cbfb73772220046d18c1.tar.lz nixpkgs-20e65d89e60d3667c529cbfb73772220046d18c1.tar.xz nixpkgs-20e65d89e60d3667c529cbfb73772220046d18c1.tar.zst nixpkgs-20e65d89e60d3667c529cbfb73772220046d18c1.zip | |
minimal-bootstrap.diffutils: use musl
| -rw-r--r-- | pkgs/os-specific/linux/minimal-bootstrap/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix | 32 |
2 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index b7d05eab8ae..48e3d4d21d3 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -50,8 +50,8 @@ lib.makeScope diffutils = callPackage ./diffutils { bash = bash_2_05; - gcc = gcc2; - glibc = glibc22; + tinycc = tinycc-musl; + musl = musl11; gawk = gawk-mes; }; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix index 7545a52524a..42db4a6640d 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix @@ -3,38 +3,36 @@ , hostPlatform , fetchurl , bash -, gcc -, glibc -, binutils -, linux-headers +, tinycc +, musl , gnumake , gnugrep , gnused , gawk , gnutar -, gzip +, xz }: let pname = "diffutils"; - version = "2.8.1"; + # last version that can be built by tinycc-musl 0.9.27 + version = "3.8"; src = fetchurl { - url = "mirror://gnu/diffutils/diffutils-${version}.tar.gz"; - sha256 = "0nizs9r76aiymzasmj1jngl7s71jfzl9xfziigcls8k9n141f065"; + url = "mirror://gnu/diffutils/diffutils-${version}.tar.xz"; + hash = "sha256-pr3X0bMSZtEcT03mwbdI1GB6sCMa9RiPwlM9CuJDj+w="; }; in bash.runCommand "${pname}-${version}" { inherit pname version; nativeBuildInputs = [ - gcc - binutils + tinycc.compiler gnumake gnused gnugrep gawk gnutar - gzip + xz ]; passthru.tests.get-version = result: @@ -52,20 +50,22 @@ bash.runCommand "${pname}-${version}" { }; } '' # Unpack - tar xzf ${src} + cp ${src} diffutils.tar.xz + unxz diffutils.tar.xz + tar xf diffutils.tar + rm diffutils.tar cd diffutils-${version} # Configure - export C_INCLUDE_PATH="${glibc}/include:${linux-headers}/include" - export LIBRARY_PATH="${glibc}/lib" - export LIBS="-lc -lnss_files -lnss_dns -lresolv" + export CC="tcc -B ${musl}/lib" + export LD=tcc bash ./configure \ --prefix=$out \ --build=${buildPlatform.config} \ --host=${hostPlatform.config} # Build - make + make AR="tcc -ar" # Install make install |