summary refs log tree commit diff
path: root/nixos/modules/virtualisation/qemu-vm.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-16 15:16:50 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-16 15:16:50 +0200
commit09dc132e04c8a69581becb56a1c5e1bfee3aef7e (patch)
tree186745725ff42ea953572f38eaca71161fee9406 /nixos/modules/virtualisation/qemu-vm.nix
parent3c6efec2c09e9389eb973ec5e45cb8e04b35f8aa (diff)
parente39bf7a7043a466761754c423b3d5783a320a6ce (diff)
downloadnixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar
nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.gz
nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.bz2
nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.lz
nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.xz
nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.zst
nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.zip
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
Diffstat (limited to 'nixos/modules/virtualisation/qemu-vm.nix')
-rw-r--r--nixos/modules/virtualisation/qemu-vm.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 33f48d65d43e..a7610b3e11a0 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -383,7 +383,7 @@ in
 
     # When building a regular system configuration, override whatever
     # video driver the host uses.
-    services.xserver.videoDrivers = mkVMOverride [ "vesa" ];
+    services.xserver.videoDrivers = mkVMOverride [ "modesetting" ];
     services.xserver.defaultDepth = mkVMOverride 0;
     services.xserver.resolutions = mkVMOverride [ { x = 1024; y = 768; } ];
     services.xserver.monitorSection =