JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minimal-bootstrap.bzip2: build with musl

Browse Source
This commit is contained in:
Emily Trau 2023-09-26 22:55:06 -07:00
parent 2f400edeb3
commit adf49a8b0c
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
, bash , bash
, tinycc , tinycc
, gnumake , gnumake
, gnupatch , gnutar
, gzip , gzip
}: }:
let let
@ -14,16 +14,6 @@ let
url = "https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz"; url = "https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz";
sha256 = "0s92986cv0p692icqlw1j42y9nld8zd83qwhzbqd61p1dqbh6nmb"; sha256 = "0s92986cv0p692icqlw1j42y9nld8zd83qwhzbqd61p1dqbh6nmb";
}; };
patches = [
# mes libc has no time support, so we remove that.
# It also does not have fch{own,mod}, which we don't care about in the bootstrap
# anyway, so we can null-op those calls.
(fetchurl {
url = "https://github.com/fosslinux/live-bootstrap/raw/87e9d7db9d22b400d1c05247254ac39ee2577e80/sysa/bzip2-1.0.8/patches/mes-libc.patch";
sha256 = "14dciwib28h413skzfkh7samzh8x87dmwhldyxxphff04pvl1j3c";
})
];
in in
bash.runCommand "${pname}-${version}" { bash.runCommand "${pname}-${version}" {
inherit pname version; inherit pname version;
@ -31,13 +21,13 @@ bash.runCommand "${pname}-${version}" {
nativeBuildInputs = [ nativeBuildInputs = [
tinycc.compiler tinycc.compiler
gnumake gnumake
gnupatch gnutar
gzip gzip
]; ];
passthru.tests.get-version = result: passthru.tests.get-version = result:
bash.runCommand "${pname}-get-version-${version}" {} '' bash.runCommand "${pname}-get-version-${version}" {} ''
${result}/bin/bzip2 --version --help ${result}/bin/bzip2 --help
mkdir $out mkdir $out
''; '';
@ -50,21 +40,16 @@ bash.runCommand "${pname}-${version}" {
}; };
} '' } ''
# Unpack # Unpack
cp ${src} bzip2.tar.gz tar xzf ${src}
gunzip bzip2.tar.gz
untar --file bzip2.tar
rm bzip2.tar
cd bzip2-${version} cd bzip2-${version}
# Patch
${lib.concatMapStringsSep "\n" (f: "patch -Np0 -i ${f}") patches}
# Build # Build
make \ make \
CC="tcc -B ${tinycc.libs}/lib -I ." \ -j $NIX_BUILD_CORES \
CC="tcc -B ${tinycc.libs}/lib" \
AR="tcc -ar" \ AR="tcc -ar" \
bzip2 bzip2recover bzip2 bzip2recover
# Install # Install
make install PREFIX=$out make install -j $NIX_BUILD_CORES PREFIX=$out
'' ''

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

@ -32,7 +32,9 @@ lib.makeScope
bzip2 = callPackage ./bzip2 { bzip2 = callPackage ./bzip2 {
bash = bash_2_05; bash = bash_2_05;
tinycc = tinycc-mes; tinycc = tinycc-musl;
gnumake = gnumake-musl;
gnutar = gnutar-musl;
}; };
coreutils = callPackage ./coreutils { tinycc = tinycc-mes; }; coreutils = callPackage ./coreutils { tinycc = tinycc-mes; };