public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib.systems: handle mips family properly

This commit is contained in:
oxalica 2019-11-03 13:17:33 +08:00
parent ea25d6bddc
commit 955d032b47
No known key found for this signature in database
GPG Key ID: CED392DE0C483D00
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/systems/default.nix
View File

@ -79,6 +79,7 @@ rec {
else if final.isAarch64 then "arm64" else if final.isAarch64 then "arm64"
else if final.isx86_32 then "x86" else if final.isx86_32 then "x86"
else if final.isx86_64 then "ia64" else if final.isx86_64 then "ia64"
else if final.isMips then "mips"
else final.parsed.cpu.name; else final.parsed.cpu.name;
qemuArch = qemuArch =
@ -90,6 +91,10 @@ rec {
powerpcle = "ppc"; powerpcle = "ppc";
powerpc64 = "ppc64"; powerpc64 = "ppc64";
powerpc64le = "ppc64le"; powerpc64le = "ppc64le";
mips = "mips";
mipsel = "mipsel";
mips64 = "mips64";
mips64el = "mips64el";
}.${final.parsed.cpu.name} or final.parsed.cpu.name; }.${final.parsed.cpu.name} or final.parsed.cpu.name;
emulator = pkgs: let emulator = pkgs: let

1
lib/systems/parse.nix
View File

@ -327,6 +327,7 @@ rec {
} }
]; ];
}; };
gnuabi64 = { abi = "64"; };
musleabi = { float = "soft"; }; musleabi = { float = "soft"; };
musleabihf = { float = "hard"; }; musleabihf = { float = "hard"; };