mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-02 10:14:09 +00:00
minimal-bootstrap.diffutils: use musl
This commit is contained in:
parent
665d360507
commit
20e65d89e6
@ -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;
|
||||
};
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user