summary refs log tree commit diff
path: root/nixos/lib
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-05-30 17:53:54 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2018-05-31 12:34:15 -0400
commit753c63dbc11bbd8a090a953acb8f9669f7f0ecf0 (patch)
tree100fff701227d94159135fd1bab16b81ae680c59 /nixos/lib
parentced1670092402319ad3260d82b41bd5306a3c266 (diff)
downloadnixlib-753c63dbc11bbd8a090a953acb8f9669f7f0ecf0.tar
nixlib-753c63dbc11bbd8a090a953acb8f9669f7f0ecf0.tar.gz
nixlib-753c63dbc11bbd8a090a953acb8f9669f7f0ecf0.tar.bz2
nixlib-753c63dbc11bbd8a090a953acb8f9669f7f0ecf0.tar.lz
nixlib-753c63dbc11bbd8a090a953acb8f9669f7f0ecf0.tar.xz
nixlib-753c63dbc11bbd8a090a953acb8f9669f7f0ecf0.tar.zst
nixlib-753c63dbc11bbd8a090a953acb8f9669f7f0ecf0.zip
qemu-flags: default to qemu-kvm
this is the "generic" version & should work everywhere.

also add darwin case
Diffstat (limited to 'nixos/lib')
-rw-r--r--nixos/lib/qemu-flags.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix
index e4c95ebdfb0d..6f61c64a832e 100644
--- a/nixos/lib/qemu-flags.nix
+++ b/nixos/lib/qemu-flags.nix
@@ -13,9 +13,9 @@
         else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'";
 
   qemuBinary = qemuPkg: {
-    "i686-linux" = "${qemuPkg}/bin/qemu-kvm";
     "x86_64-linux" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
     "armv7l-linux" = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
     "aarch64-linux" = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
-  }.${pkgs.stdenv.system} or (throw "Unknown QEMU binary for '${pkgs.stdenv.system}'");
+    "x86_64-darwin" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
+  }.${pkgs.stdenv.system} or "${qemuPkg}/bin/qemu-kvm";
 }