diff options
Diffstat (limited to 'pkgs/top-level/release-cross.nix')
| -rw-r--r-- | pkgs/top-level/release-cross.nix | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 61cf865371d..74394379b39 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -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 |