about summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-07-31 02:13:24 -0400
committerGitHub <noreply@github.com>2019-07-31 02:13:24 -0400
commitea8fc751607363cefce36044f475f4b7655e6f23 (patch)
treeede86a9c22e9d29c0328d05028fe9b9d0fd824c3 /nixos/modules/services
parent76f4626e80cc0d6547960d20492667f185afd39d (diff)
parent4f309207c70c85b20fbe11f207a96befc02e282a (diff)
downloadnixlib-ea8fc751607363cefce36044f475f4b7655e6f23.tar
nixlib-ea8fc751607363cefce36044f475f4b7655e6f23.tar.gz
nixlib-ea8fc751607363cefce36044f475f4b7655e6f23.tar.bz2
nixlib-ea8fc751607363cefce36044f475f4b7655e6f23.tar.lz
nixlib-ea8fc751607363cefce36044f475f4b7655e6f23.tar.xz
nixlib-ea8fc751607363cefce36044f475f4b7655e6f23.tar.zst
nixlib-ea8fc751607363cefce36044f475f4b7655e6f23.zip
Merge pull request #64948 from ambrop72/videodrivers-radeon-alias
nixos/xserver: Make radeon in videoDrivers an alias for ati.
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/x11/xserver.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 82730c5e80c6..b1a316706976 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -14,6 +14,9 @@ let
     # Alias so people can keep using "virtualbox" instead of "vboxvideo".
     virtualbox = { modules = [ xorg.xf86videovboxvideo ]; driverName = "vboxvideo"; };
 
+    # Alias so that "radeon" uses the xf86-video-ati driver.
+    radeon = { modules = [ xorg.xf86videoati ]; driverName = "ati"; };
+
     # modesetting does not have a xf86videomodesetting package as it is included in xorgserver
     modesetting = {};
   };
@@ -241,7 +244,7 @@ in
       videoDrivers = mkOption {
         type = types.listOf types.str;
         # !!! We'd like "nv" here, but it segfaults the X server.
-        default = [ "ati" "cirrus" "vesa" "vmware" "modesetting" ];
+        default = [ "radeon" "cirrus" "vesa" "vmware" "modesetting" ];
         example = [
           "ati_unfree" "amdgpu" "amdgpu-pro"
           "nv" "nvidia" "nvidiaLegacy390" "nvidiaLegacy340" "nvidiaLegacy304"