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

bootstrap-tools-cross, release-cross: add various musl entries

Browse Source
This commit is contained in:
Will Dietz 2018-01-15 11:20:33 -06:00
parent 3c750912e1
commit 9bc8127dc3
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View File

@ -13,5 +13,8 @@ in with (import ../../../lib).systems.examples; {
armv6l = make raspberryPi; armv6l = make raspberryPi;
armv7l = make armv7l-hf-multiplatform; armv7l = make armv7l-hf-multiplatform;
aarch64 = make aarch64-multiplatform; aarch64 = make aarch64-multiplatform;
musl = make musl64; x86_64-musl = make musl64;
i686-musl = make musl32;
armv6l-musl = make muslpi;
aarch64-musl = make aarch64-multiplatform-musl;
} }

11
pkgs/top-level/release-cross.nix
View File

@ -125,7 +125,16 @@ in
android = mapTestOnCross lib.systems.examples.aarch64-multiplatform (linuxCommon // { android = mapTestOnCross lib.systems.examples.aarch64-multiplatform (linuxCommon // {
}); });
musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon; x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon;
rpi-musl = mapTestOnCross lib.systems.examples.muslpi (linuxCommon // {
vim = nativePlatforms;
unzip = nativePlatforms;
ddrescue = nativePlatforms;
lynx = nativePlatforms;
patchelf = nativePlatforms;
buildPackages.binutils = nativePlatforms;
mpg123 = nativePlatforms;
});
/* Cross-built bootstrap tools for every supported platform */ /* Cross-built bootstrap tools for every supported platform */
bootstrapTools = let bootstrapTools = let