From a1c2c50cbc481337294c9b75b85df36720ebee00 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 1 Oct 2023 23:54:39 +0300 Subject: [PATCH] bootstrap-tools-cross: sort --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index c66acea685c3..1aebb898b64f 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -12,16 +12,19 @@ let pkgs = releaseLib.pkgsForCross crossSystem system; }; in lib.mapAttrs (n: make) (with lib.systems.examples; { + # Sort following the sorting in `pkgs/stdenv/linux/default.nix` `bootstrapFiles` argument. armv5tel = sheevaplug; armv6l = raspberryPi; armv7l = armv7l-hf-multiplatform; aarch64 = aarch64-multiplatform; - x86_64-musl = musl64; - armv6l-musl = muslpi; - aarch64-musl = aarch64-multiplatform-musl; - riscv64 = riscv64; + mipsel-linux-gnu = mipsel-linux-gnu; mips64el-linux-gnuabin32 = mips64el-linux-gnuabin32; mips64el-linux-gnuabi64 = mips64el-linux-gnuabi64; - mipsel-linux-gnu = mipsel-linux-gnu; powerpc64le = powernv; + riscv64 = riscv64; + + # musl + aarch64-musl = aarch64-multiplatform-musl; + armv6l-musl = muslpi; + x86_64-musl = musl64; })