From 955d032b47fbcbf8e366a3a8cdcea4ac5f7b63d7 Mon Sep 17 00:00:00 2001 From: oxalica Date: Sun, 3 Nov 2019 13:17:33 +0800 Subject: [PATCH] lib.systems: handle mips family properly --- lib/systems/default.nix | 5 +++++ lib/systems/parse.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 0c0cdf1f11b..ccb928eace7 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -79,6 +79,7 @@ rec { else if final.isAarch64 then "arm64" else if final.isx86_32 then "x86" else if final.isx86_64 then "ia64" + else if final.isMips then "mips" else final.parsed.cpu.name; qemuArch = @@ -90,6 +91,10 @@ rec { powerpcle = "ppc"; powerpc64 = "ppc64"; powerpc64le = "ppc64le"; + mips = "mips"; + mipsel = "mipsel"; + mips64 = "mips64"; + mips64el = "mips64el"; }.${final.parsed.cpu.name} or final.parsed.cpu.name; emulator = pkgs: let diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 5e12df32ffd..e923334a11b 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -327,6 +327,7 @@ rec { } ]; }; + gnuabi64 = { abi = "64"; }; musleabi = { float = "soft"; }; musleabihf = { float = "hard"; };