From eba6e0456b1ed751f19e94ce9d416d47f0009803 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Aug 2011 15:16:42 +0000
Subject: [PATCH] * Use the VESA driver.  It seems to work better now.  In
 particular,   it doesn't turn blue backgrounds into yellow (see   e.g.
 http://hydra.nixos.org/build/1232626/download/1/screen.png).

svn path=/nixos/trunk/; revision=28395
---
 modules/virtualisation/qemu-vm.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 4b29f38b420..22a24f062f4 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -298,7 +298,7 @@ in
       
   virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
 
-  virtualisation.qemu.options = [ "-usbdevice tablet" ];
+  virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ];
   
   # Mount the host filesystem via CIFS, and bind-mount the Nix store
   # of the host into our own filesystem.  We use mkOverride to allow
@@ -365,8 +365,9 @@ in
   # When building a regular system configuration, override whatever
   # video driver the host uses.
   services.xserver.videoDriver = mkOverride 50 null;
-  services.xserver.videoDrivers = mkOverride 50 [ "cirrus" "vesa" ];
+  services.xserver.videoDrivers = mkOverride 50 [ "vesa" ];
   services.xserver.defaultDepth = mkOverride 50 0;
+  services.xserver.resolutions = mkOverride 50 [ { x = 1024; y = 768; } ];
   services.xserver.monitorSection =
     ''
       # Set a higher refresh rate so that resolutions > 800x600 work.