From ea3eb991b70d95e15080a3852c743b0f1d98f061 Mon Sep 17 00:00:00 2001 From: Patrick John Wheeler Date: Fri, 1 Mar 2013 02:53:08 +0100 Subject: [PATCH 1/2] 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. --- modules/services/x11/xserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From fc7c7ae91a70d426a618bbeabfdbbd4a18f8af15 Mon Sep 17 00:00:00 2001 From: Patrick Wheeler Date: Fri, 1 Mar 2013 11:05:00 -0600 Subject: [PATCH 2/2] Remove vmware comment --- modules/services/x11/xserver.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index 2210fea4e72..82b0d06f1c8 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -192,8 +192,7 @@ in }; videoDrivers = mkOption { - # !!! We'd like "nv" here, but it segfaults the X server. Idem for - # "vmware". + # !!! We'd like "nv" here, but it segfaults the X server. default = [ "ati" "cirrus" "intel" "vesa" "vmware" ]; example = [ "vesa" ]; description = ''