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

* X server autoconfiguration. Rather than specifying a fixed video

Browse Source 
driver (in services.xserver.videoDriver), the X server is now given
  a set of drivers, and will use PCI ids to find the right one.

  The only problem is that the choice of OpenGL driver (the
  /var/run/opengl-driver symlink) depends on what driver is selected
  at runtime (i.e. the NVIDIA implementation for "nvidia", and Mesa
  for all other drivers).  However this isn't a big problem right now
  since "nvidia" isn't included in the default set of drivers anyway
  for legal reasons.
  
* `services.xserver.resolutions' now defaults to [], meaning that the
  X server should figure out the desired resolution(s) itself.
  Likewise, `services.xserver.defaultDepth' defaults to 0 to let the X
  server figure it out.

* Removed some options from xorg.conf that no longer appear needed
  ("Composite" and the DRI "Mode").

svn path=/nixos/trunk/; revision=18176
This commit is contained in:
Eelco Dolstra
2009-11-06 00:59:03 +00:00
parent fe1f084728
commit 3e9665dd96
2 changed files with 113 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,8 +135,10 @@ in
# When building a regular system configuration, override whatever
# video driver the host uses.
services.xserver.videoDriver = pkgs.lib.mkOverride 50 {} "vesa";
services.xserver.defaultDepth = pkgs.lib.mkOverride 50 {} 16;
services.xserver.videoDriver = pkgs.lib.mkOverride 50 {} null;
services.xserver.videoDrivers = pkgs.lib.mkOverride 50 {} [ "cirrus" "vesa" ];
services.xserver.defaultDepth = pkgs.lib.mkOverride 50 {} 0;
services.xserver.resolutions = pkgs.lib.mkOverride 50 {} [];
# Wireless won't work in the VM.
networking.enableWLAN = pkgs.lib.mkOverride 50 {} false;