summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick John Wheeler <Patrick.John.Wheeler@gmail.com>2013-03-01 02:53:08 +0100
committerPatrick John Wheeler <Patrick.John.Wheeler@gmail.com>2013-03-01 02:53:08 +0100
commitea3eb991b70d95e15080a3852c743b0f1d98f061 (patch)
treeed5e0ff4222da331b329173abe05f5dac333a73d
parent568683316b0a3d23bd0623aaffe6342424cf3616 (diff)
downloadnixpkgs-ea3eb991b70d95e15080a3852c743b0f1d98f061.tar
nixpkgs-ea3eb991b70d95e15080a3852c743b0f1d98f061.tar.gz
nixpkgs-ea3eb991b70d95e15080a3852c743b0f1d98f061.tar.bz2
nixpkgs-ea3eb991b70d95e15080a3852c743b0f1d98f061.tar.lz
nixpkgs-ea3eb991b70d95e15080a3852c743b0f1d98f061.tar.xz
nixpkgs-ea3eb991b70d95e15080a3852c743b0f1d98f061.tar.zst
nixpkgs-ea3eb991b70d95e15080a3852c743b0f1d98f061.zip
Fix Xorg-server on vmware inconjunction with fix to
xf86videovmware[1].

Adds "vmware" to list of default options of
services.xerver.videoDrivers.

new default:
 [ "ati" "cirrus" "intel" "vesa" "vmware" ]

old default:
 [ "ati" "cirrus" "intel" "vesa" ]

[1] Pull request for xf86videovmware found at
https://github.com/NixOS/nixpkgs/pull/338.
-rw-r--r--modules/services/x11/xserver.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 643fc42dc62..2210fea4e72 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -194,7 +194,7 @@ in
       videoDrivers = mkOption {
         # !!! We'd like "nv" here, but it segfaults the X server.  Idem for
         # "vmware".
-        default = [ "ati" "cirrus" "intel" "vesa" ];
+        default = [ "ati" "cirrus" "intel" "vesa" "vmware" ];
         example = [ "vesa" ];
         description = ''
           The names of the video drivers that the X server should