mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 15:11:25 +00:00
release-cross: minor cleanup, add aarch64-musl
This commit is contained in:
parent
844a494d80
commit
76879b83ac
@ -50,6 +50,15 @@ let
|
||||
buildPackages.binutils = darwin;
|
||||
};
|
||||
|
||||
rpiCommon = linuxCommon // {
|
||||
vim = nativePlatforms;
|
||||
unzip = nativePlatforms;
|
||||
ddrescue = nativePlatforms;
|
||||
lynx = nativePlatforms;
|
||||
patchelf = nativePlatforms;
|
||||
buildPackages.binutils = nativePlatforms;
|
||||
mpg123 = nativePlatforms;
|
||||
};
|
||||
in
|
||||
|
||||
{
|
||||
@ -111,30 +120,14 @@ in
|
||||
fuloongminipc = mapTestOnCross lib.systems.examples.fuloongminipc linuxCommon;
|
||||
|
||||
/* Linux on Raspberrypi */
|
||||
rpi = mapTestOnCross lib.systems.examples.raspberryPi (linuxCommon // {
|
||||
vim = nativePlatforms;
|
||||
unzip = nativePlatforms;
|
||||
ddrescue = nativePlatforms;
|
||||
lynx = nativePlatforms;
|
||||
patchelf = nativePlatforms;
|
||||
buildPackages.binutils = nativePlatforms;
|
||||
mpg123 = nativePlatforms;
|
||||
});
|
||||
rpi = mapTestOnCross lib.systems.examples.raspberryPi rpiCommon;
|
||||
rpi-musl = mapTestOnCross lib.systems.examples.muslpi rpiCommon;
|
||||
|
||||
/* Linux on Aarch64 (TODO make android for real) */
|
||||
android = mapTestOnCross lib.systems.examples.aarch64-multiplatform (linuxCommon // {
|
||||
});
|
||||
android = mapTestOnCross lib.systems.examples.aarch64-multiplatform linuxCommon;
|
||||
aarch64-musl = mapTestOnCross lib.systems.examples.aarch64-multiplatform-musl 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 */
|
||||
bootstrapTools = let
|
||||
|
Loading…
Reference in New Issue
Block a user