summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-11-24 14:43:50 +0200
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-11-26 11:13:21 +0200
commit0a2eda7a7e3cf7eadb0401f07071e1a3c22a4675 (patch)
treef0fe1e0b6a8fc1666a2d308e95261100aa3bd7c0 /nixos
parent43cb964e1773db2b8f01ccaeaaada3a641365e91 (diff)
downloadnixpkgs-0a2eda7a7e3cf7eadb0401f07071e1a3c22a4675.tar
nixpkgs-0a2eda7a7e3cf7eadb0401f07071e1a3c22a4675.tar.gz
nixpkgs-0a2eda7a7e3cf7eadb0401f07071e1a3c22a4675.tar.bz2
nixpkgs-0a2eda7a7e3cf7eadb0401f07071e1a3c22a4675.tar.lz
nixpkgs-0a2eda7a7e3cf7eadb0401f07071e1a3c22a4675.tar.xz
nixpkgs-0a2eda7a7e3cf7eadb0401f07071e1a3c22a4675.tar.zst
nixpkgs-0a2eda7a7e3cf7eadb0401f07071e1a3c22a4675.zip
nixos/qemu-vm: Don't try enabling graphics/mouse on non-x86
Needs to be figured out some day, just disable them for now.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/virtualisation/qemu-vm.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 22fa3596450..3f10180cd1c 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -439,7 +439,9 @@ in
 
     virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
 
-    virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ];
+    # FIXME: Figure out how to make this work on non-x86
+    virtualisation.qemu.options =
+      mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usbdevice tablet" ];
 
     # Mount the host filesystem via 9P, and bind-mount the Nix store
     # of the host into our own filesystem.  We use mkVMOverride to