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

Merge pull request #35337 from dtzWill/feature/release-cross-minor-cleanup

Browse Source 
release-cross: minor cleanup, add aarch64-musl
This commit is contained in:
Will Dietz 2018-02-22 08:44:56 -06:00 committed by GitHub
commit 12f20b3d0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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