From 616c844336cfc0a3ab958bbbb4fcab45142f5852 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sun, 8 Nov 2009 16:01:22 +0000 Subject: [PATCH] * Move the default value of videoDrivers into the default field of the option. Otherwise, the system may depends on unused/unsupported softwares and users will be force to use properties in their configuration.nix file to override this default value. (too complex for new users) svn path=/nixos/trunk/; revision=18288 --- modules/services/x11/xserver.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index 25b5c4a615f5..92324de042f7 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -179,7 +179,9 @@ in }; videoDrivers = mkOption { - default = []; + # !!! We'd like "nv" here, but it segfaults the X server. Idem for + # "vmware". + default = [ "ati" "cirrus" "intel" "vesa" ]; example = [ "vesa" ]; description = '' The names of the video drivers that the X server should @@ -496,10 +498,6 @@ in '')} ''; - # The default set of supported video drivers. !!! We'd like "nv" - # here, but it segfaults the X server. Idem for "vmware". - services.xserver.videoDrivers = [ "ati" "cirrus" "intel" "vesa" ]; - }; }