diff options
| author | Danylo Hlynskyi <abcz2.uprola@gmail.com> | 2019-08-05 14:09:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-05 14:09:28 +0300 |
| commit | 7585496effbf7fe7815265c2211e8745a90d3136 (patch) | |
| tree | 38eda227ff9b4ef2c467388a6a399d4daf929b06 /nixos/modules/services/x11/xserver.nix | |
| parent | d0413360d3a6c51dc56d4ce0ab07ad4678a83ada (diff) | |
| parent | 4e795680bef5fb8740442451496f890c301d8592 (diff) | |
| download | nixpkgs-7585496effbf7fe7815265c2211e8745a90d3136.tar nixpkgs-7585496effbf7fe7815265c2211e8745a90d3136.tar.gz nixpkgs-7585496effbf7fe7815265c2211e8745a90d3136.tar.bz2 nixpkgs-7585496effbf7fe7815265c2211e8745a90d3136.tar.lz nixpkgs-7585496effbf7fe7815265c2211e8745a90d3136.tar.xz nixpkgs-7585496effbf7fe7815265c2211e8745a90d3136.tar.zst nixpkgs-7585496effbf7fe7815265c2211e8745a90d3136.zip | |
Merge branch 'master' into flip-map-foreach
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index e716d3bcdc6..fab0034d3fd 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" |