about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-11-06 10:24:05 -0500
committerGitHub <noreply@github.com>2019-11-06 10:24:05 -0500
commit46f1daead7dbac039e3efea94aaaec7a0b4291db (patch)
tree172d2d718732509ff48443a3aa1d2400b5415da7 /lib
parentc54848ee77194b8ebc874a45534bc818fd19b89b (diff)
parentc98da738023ed72b78b5a4712c22f2350a7c0efb (diff)
Merge pull request #72727 from oxalica/mips-parse
lib.systems: handle mips family properly
Diffstat (limited to 'lib')
-rw-r--r--lib/systems/default.nix1
-rw-r--r--lib/systems/parse.nix1
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 0c0cdf1f11b19..0d51be4b23bc5 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 =
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 5e12df32ffdd2..e923334a11bd2 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"; };