diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ab3243a4f7f..86a3dca0d1e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -233,6 +233,7 @@
./services/x11/hardware/multitouch.nix
./services/x11/hardware/synaptics.nix
./services/x11/hardware/wacom.nix
+ ./services/x11/mesa.nix
./services/x11/window-managers/awesome.nix
#./services/x11/window-managers/compiz.nix
./services/x11/window-managers/default.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index ae3c9faeea6..6ff5277cf9c 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -113,6 +113,11 @@ in zipModules ([]
# !!! this hardcodes bash, could we detect from config which shell is actually used?
++ obsolete [ "environment" "promptInit" ] [ "programs" "bash" "promptInit" ]
+++ obsolete [ "services" "xserver" "driSupport" ] [ "services" "mesa" "driSupport" ]
+++ obsolete [ "services" "xserver" "driSupport32Bit" ] [ "services" "mesa" "driSupport32Bit" ]
+++ obsolete [ "services" "xserver" "s3tcSupport" ] [ "services" "mesa" "s3tcSupport" ]
+++ obsolete [ "services" "xserver" "videoDrivers" ] [ "services" "mesa" "videoDrivers" ]
+
# Options that are obsolete and have no replacement.
++ obsolete' [ "boot" "loader" "grub" "bootDevice" ]
++ obsolete' [ "boot" "initrd" "luks" "enable" ]
diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index 97fe7a1ca1b..c1e98e8bb00 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -60,5 +60,7 @@ in {
drm
hwaccel
'';
+
+ services.mesa.enable = mkIf cfg.hwRender true;
};
}
diff --git a/nixos/modules/services/x11/mesa.nix b/nixos/modules/services/x11/mesa.nix
new file mode 100644
index 00000000000..fdf1ca74b6e
--- /dev/null
+++ b/nixos/modules/services/x11/mesa.nix
@@ -0,0 +1,124 @@
+{ config, pkgs, pkgs_i686, ... }:
+let
+ inherit (pkgs.lib) mkOption types mkIf optional optionals elem optionalString;
+
+ cfg = config.services.mesa;
+
+ kernelPackages = config.boot.kernelPackages;
+in {
+ options = {
+ services.mesa.enable = mkOption {
+ description = "Whether this configuration requires mesa";
+ type = types.bool;
+ default = false;
+ internal = true;
+ };
+
+ services.mesa.driSupport = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to enable accelerated OpenGL rendering through the
+ Direct Rendering Interface (DRI).
+ '';
+ };
+
+ services.mesa.driSupport32Bit = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ On 64-bit systems, whether to support Direct Rendering for
+ 32-bit applications (such as Wine). This is currently only
+ supported for the nvidia driver and for
+ mesa.
+ '';
+ };
+
+ services.mesa.s3tcSupport = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Make S3TC(S3 Texture Compression) via libtxc_dxtn available
+ to OpenGL drivers. It is essential for many games to work
+ with FOSS GPU drivers.
+
+ Using this library may require a patent license depending on your location.
+ '';
+ };
+
+
+ services.mesa.videoDrivers = mkOption {
+ type = types.listOf types.str;
+ # !!! We'd like "nv" here, but it segfaults the X server.
+ default = [ "ati" "cirrus" "intel" "vesa" "vmware" ];
+ example = [ "vesa" ];
+ description = ''
+ The names of the video drivers that the mesa should
+ support. Mesa will try all of the drivers listed
+ here until it finds one that supports your video card.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ system.activationScripts.setup-opengl.deps = [];
+ system.activationScripts.setup-opengl.text = ''
+ rm -f /run/opengl-driver{,-32}
+ ${optionalString (!cfg.driSupport32Bit) "ln -sf opengl-driver /run/opengl-driver-32"}
+
+ ${# !!! The OpenGL driver depends on what's detected at runtime.
+ if elem "nvidia" cfg.videoDrivers then
+ ''
+ ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver
+ ${optionalString cfg.driSupport32Bit
+ "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
+ ''
+ else if elem "nvidiaLegacy173" cfg.videoDrivers then
+ "ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver"
+ else if elem "nvidiaLegacy304" cfg.videoDrivers then
+ ''
+ ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver
+ ${optionalString cfg.driSupport32Bit
+ "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11_legacy304.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
+ ''
+ else if elem "ati_unfree" cfg.videoDrivers then
+ "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
+ else
+ ''
+ ${optionalString cfg.driSupport "ln -sf ${pkgs.mesa_drivers} /run/opengl-driver"}
+ ${optionalString cfg.driSupport32Bit
+ "ln -sf ${pkgs_i686.mesa_drivers} /run/opengl-driver-32"}
+ ''
+ }
+ '';
+
+ environment.variables.LD_LIBRARY_PATH =
+ [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]
+ ++ optional cfg.s3tcSupport "${pkgs.libtxc_dxtn}/lib"
+ ++ optional (cfg.s3tcSupport && cfg.driSupport32Bit) "${pkgs_i686.libtxc_dxtn}/lib";
+
+ boot.extraModulePackages =
+ optional (elem "nvidia" cfg.videoDrivers) kernelPackages.nvidia_x11 ++
+ optional (elem "nvidiaLegacy173" cfg.videoDrivers) kernelPackages.nvidia_x11_legacy173 ++
+ optional (elem "nvidiaLegacy304" cfg.videoDrivers) kernelPackages.nvidia_x11_legacy304 ++
+ optional (elem "virtualbox" cfg.videoDrivers) kernelPackages.virtualboxGuestAdditions ++
+ optional (elem "ati_unfree" cfg.videoDrivers) kernelPackages.ati_drivers_x11;
+
+ boot.blacklistedKernelModules =
+ optionals (elem "nvidia" cfg.videoDrivers) [ "nouveau" "nvidiafb" ];
+
+ environment.etc = (optional (elem "ati_unfree" cfg.videoDrivers) [
+ # according toiive on #ati you don't need the pcs, it is like registry... keeps old stuff to make your
+ # life harder ;) Still it seems to be required
+ { source = "${kernelPackages.ati_drivers_x11}/etc/ati";
+ target = "ati";
+ }
+ ])
+ ++ (optional (elem "nvidia" cfg.videoDrivers) [
+
+ { source = "${kernelPackages.nvidia_x11}/lib/vendors/nvidia.icd";
+ target = "OpenCL/vendors/nvidia.icd";
+ }
+ ]);
+ };
+}
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 60ed165d7ba..972fa7898cb 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -22,8 +22,7 @@ let
virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
};
- driverNames =
- optional (cfg.videoDriver != null) cfg.videoDriver ++ cfg.videoDrivers;
+ driverNames = config.services.mesa.vidoeDrivers;
drivers = flip map driverNames
(name: { inherit name; driverName = name; } //
@@ -182,19 +181,7 @@ in
description = ''
The name of the video driver for your graphics card. This
option is obsolete; please set the
- instead.
- '';
- };
-
- videoDrivers = mkOption {
- type = types.listOf types.str;
- # !!! We'd like "nv" here, but it segfaults the X server.
- default = [ "ati" "cirrus" "intel" "vesa" "vmware" ];
- example = [ "vesa" ];
- description = ''
- The names of the video drivers that the X server should
- support. The X server will try all of the drivers listed
- here until it finds one that supports your video card.
+ instead.
'';
};
@@ -207,38 +194,6 @@ in
'';
};
- driSupport = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Whether to enable accelerated OpenGL rendering through the
- Direct Rendering Interface (DRI).
- '';
- };
-
- driSupport32Bit = mkOption {
- type = types.bool;
- default = false;
- description = ''
- On 64-bit systems, whether to support Direct Rendering for
- 32-bit applications (such as Wine). This is currently only
- supported for the nvidia driver and for
- mesa.
- '';
- };
-
- s3tcSupport = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Make S3TC(S3 Texture Compression) via libtxc_dxtn available
- to OpenGL drivers. It is essential for many games to work
- with FOSS GPU drivers.
-
- Using this library may require a patent license depending on your location.
- '';
- };
-
startOpenSSHAgent = mkOption {
type = types.bool;
default = true;
@@ -426,6 +381,8 @@ in
###### implementation
config = mkIf cfg.enable {
+ services.mesa.enable = true;
+ services.mesa.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];
assertions =
[ { assertion = !(cfg.startOpenSSHAgent && cfg.startGnuPGAgent);
@@ -440,21 +397,6 @@ in
}
];
- boot.extraModulePackages =
- optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++
- optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173 ++
- optional (elem "nvidiaLegacy304" driverNames) kernelPackages.nvidia_x11_legacy304 ++
- optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++
- optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
-
- boot.blacklistedKernelModules =
- optionals (elem "nvidia" driverNames) [ "nouveau" "nvidiafb" ];
-
- environment.variables.LD_LIBRARY_PATH =
- [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]
- ++ pkgs.lib.optional cfg.s3tcSupport "${pkgs.libtxc_dxtn}/lib"
- ++ pkgs.lib.optional (cfg.s3tcSupport && cfg.driSupport32Bit) "${pkgs_i686.libtxc_dxtn}/lib";
-
environment.etc =
(optionals cfg.exportConfiguration
[ { source = "${configFile}";
@@ -464,21 +406,7 @@ in
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
target = "X11/xkb";
}
- ])
- ++ (optionals (elem "ati_unfree" driverNames) [
-
- # according toiive on #ati you don't need the pcs, it is like registry... keeps old stuff to make your
- # life harder ;) Still it seems to be required
- { source = "${kernelPackages.ati_drivers_x11}/etc/ati";
- target = "ati";
- }
- ])
- ++ (optionals (elem "nvidia" driverNames) [
-
- { source = "${kernelPackages.nvidia_x11}/lib/vendors/nvidia.icd";
- target = "OpenCL/vendors/nvidia.icd";
- }
- ]);
+ ]);
environment.systemPackages =
[ xorg.xorgserver
@@ -529,34 +457,6 @@ in
preStart =
''
- rm -f /run/opengl-driver{,-32}
- ${optionalString (!cfg.driSupport32Bit) "ln -sf opengl-driver /run/opengl-driver-32"}
-
- ${# !!! The OpenGL driver depends on what's detected at runtime.
- if elem "nvidia" driverNames then
- ''
- ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver
- ${optionalString cfg.driSupport32Bit
- "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
- ''
- else if elem "nvidiaLegacy173" driverNames then
- "ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver"
- else if elem "nvidiaLegacy304" driverNames then
- ''
- ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver
- ${optionalString cfg.driSupport32Bit
- "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11_legacy304.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
- ''
- else if elem "ati_unfree" driverNames then
- "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
- else
- ''
- ${optionalString cfg.driSupport "ln -sf ${pkgs.mesa_drivers} /run/opengl-driver"}
- ${optionalString cfg.driSupport32Bit
- "ln -sf ${pkgs_i686.mesa_drivers} /run/opengl-driver-32"}
- ''
- }
-
${cfg.displayManager.job.preStart}
rm -f /tmp/.X0-lock