From 4f309207c70c85b20fbe11f207a96befc02e282a Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Tue, 16 Jul 2019 22:52:33 +0200 Subject: nixos/xserver: Make radeon in videoDrivers an alias for ati. The old open-source driver for AMD/ATI GPUs is commonly known as "radeon" despite the historical package name xf86-video-ati. For example it presents itself as RADEON in the Xorg log. So adding "radeon" to videoDrivers should work. Also changed the docs for the videoDrivers option to use "radeon" in the default value instead of "ati". Fixes #37917 --- nixos/modules/services/x11/xserver.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'nixos/modules/services') 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" -- cgit 1.4.1