diff options
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/release-cross.nix | 11 |
2 files changed, 20 insertions, 8 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 10adb0a635db..d08be79e6c55 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -7,11 +7,14 @@ let }; in with (import ../../../lib).systems.examples; { - armv5tel = make sheevaplug; - scaleway = make scaleway-c1; - pogoplug4 = make pogoplug4; - armv6l = make raspberryPi; - armv7l = make armv7l-hf-multiplatform; - aarch64 = make aarch64-multiplatform; - musl = make musl64; + armv5tel = make sheevaplug; + scaleway = make scaleway-c1; + pogoplug4 = make pogoplug4; + armv6l = make raspberryPi; + armv7l = make armv7l-hf-multiplatform; + aarch64 = make aarch64-multiplatform; + x86_64-musl = make musl64; + i686-musl = make musl32; + armv6l-musl = make muslpi; + aarch64-musl = make aarch64-multiplatform-musl; } diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 4c9cbde8100e..61cf865371df 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -125,7 +125,16 @@ in 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 */ bootstrapTools = let |