public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* In QEMU, set a higher refresh rate in xorg.conf so that resolutions

Browse Source 
higher than 800x600 work.
* Add a "Monitor" statement to the "Screen" section, because otherwise
  the Monitor section is ignored.

svn path=/nixos/trunk/; revision=23068
This commit is contained in:
Eelco Dolstra 2010-08-09 20:10:16 +00:00
parent 057602f3f2
commit 31db968be4
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/services/x11/xserver.nix
View File

@ -137,6 +137,7 @@ in
resolutions = mkOption { resolutions = mkOption {
default = []; default = [];
example = [ { x = 1600; y = 1200; } { x = 1024; y = 786; } ];
description = '' description = ''
The screen resolutions for the X server. The first element The screen resolutions for the X server. The first element
is the default resolution. If this list is empty, the X is the default resolution. If this list is empty, the X
@ -496,6 +497,9 @@ in
Section "Screen" Section "Screen"
Identifier "Screen-${driver.name}[0]" Identifier "Screen-${driver.name}[0]"
Device "Device-${driver.name}[0]" Device "Device-${driver.name}[0]"
${optionalString (cfg.monitorSection != "") ''
Monitor "Monitor[0]"
''}
${cfg.screenSection} ${cfg.screenSection}
@ -508,9 +512,11 @@ in
''} ''}
${optionalString ${optionalString
(driver.name != "virtualbox" && (cfg.resolutions != [] (driver.name != "virtualbox" &&
|| cfg.extraDisplaySettings != "" || cfg.virtualScreen != null)) ( (cfg.resolutions != [] ||
let cfg.extraDisplaySettings != "" ||
cfg.virtualScreen != null))
(let
f = depth: f = depth:
'' ''
SubSection "Display" SubSection "Display"

7
modules/virtualisation/qemu-vm.nix
View File

@ -265,7 +265,12 @@ in
services.xserver.videoDriver = mkOverride 50 {} null; services.xserver.videoDriver = mkOverride 50 {} null;
services.xserver.videoDrivers = mkOverride 50 {} [ "cirrus" "vesa" ]; services.xserver.videoDrivers = mkOverride 50 {} [ "cirrus" "vesa" ];
services.xserver.defaultDepth = mkOverride 50 {} 0; services.xserver.defaultDepth = mkOverride 50 {} 0;
services.xserver.resolutions = mkOverride 50 {} []; services.xserver.monitorSection =
''
# Set a higher refresh rate so that resolutions > 800x600 work.
HorizSync 30-140
VertRefresh 50-160
'';
services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0"; services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";