diff options
| author | John Ericson <git@JohnEricson.me> | 2019-11-11 20:47:51 -0500 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-11-11 20:48:14 -0500 |
| commit | 16f0fe7fe37722ccdc696cf7338cc3e5676346b0 (patch) | |
| tree | 66aea0e7108c1817eb99466e731d32d172b9e2d0 /lib/systems | |
| parent | 63eac673199d78b2dcd061904811445addad3822 (diff) | |
| parent | e3b76760e38912e5b3298dfc19f9c75e7ed2ffd9 (diff) | |
| download | nixpkgs-16f0fe7fe37722ccdc696cf7338cc3e5676346b0.tar nixpkgs-16f0fe7fe37722ccdc696cf7338cc3e5676346b0.tar.gz nixpkgs-16f0fe7fe37722ccdc696cf7338cc3e5676346b0.tar.bz2 nixpkgs-16f0fe7fe37722ccdc696cf7338cc3e5676346b0.tar.lz nixpkgs-16f0fe7fe37722ccdc696cf7338cc3e5676346b0.tar.xz nixpkgs-16f0fe7fe37722ccdc696cf7338cc3e5676346b0.tar.zst nixpkgs-16f0fe7fe37722ccdc696cf7338cc3e5676346b0.zip | |
Merge remote-tracking branch 'upstream/master' into mingw-mcfthreads
Diffstat (limited to 'lib/systems')
| -rw-r--r-- | lib/systems/default.nix | 1 | ||||
| -rw-r--r-- | lib/systems/parse.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 0c0cdf1f11b..0d51be4b23b 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 5a3805cf997..36235744602 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -330,6 +330,7 @@ rec { } ]; }; + gnuabi64 = { abi = "64"; }; musleabi = { float = "soft"; }; musleabihf = { float = "hard"; }; |