about summary refs log tree commit diff
path: root/lib/systems/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-03-01 14:38:34 +0000
committerAlyssa Ross <hi@alyssa.is>2023-03-09 19:25:23 +0000
commitbc7d355dc07ad0c789e45877cd8d7896253923ad (patch)
treeef18c77fe2c32e86dee9b0301a9075169ef3578b /lib/systems/default.nix
parent56be2087c5c3080052a2b70376cb70f810b34d14 (diff)
lib.systems: don't try to emulate s390-linux
We don't have an emulator that can do this.
Diffstat (limited to 'lib/systems/default.nix')
-rw-r--r--lib/systems/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 4a5e66caec7c4..7e6fa5ecfb4bc 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -140,6 +140,7 @@ rec {
 
       qemuArch =
         if final.isAarch32 then "arm"
+        else if final.isS390 && !final.isS390x then null
         else if final.isx86_64 then "x86_64"
         else if final.isx86 then "i386"
         else final.uname.processor;
@@ -193,7 +194,7 @@ rec {
           then "${pkgs.runtimeShell} -c '\"$@\"' --"
           else if final.isWindows
           then "${wine}/bin/wine${lib.optionalString (final.parsed.cpu.bits == 64) "64"}"
-          else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux
+          else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null
           then "${qemu-user}/bin/qemu-${final.qemuArch}"
           else if final.isWasi
           then "${pkgs.wasmtime}/bin/wasmtime"