summary refs log tree commit diff
path: root/nixos/modules/hardware/video
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-02-07 20:49:58 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-02-07 20:49:58 +0100
commitce9d30e7349d0f712ed4ce9e6a20102490d364e9 (patch)
tree6c28757083660c4adeebc23a1ae4f62466b04617 /nixos/modules/hardware/video
parent11621b9ec042cf5dc022ce9bc91624b62e0d874a (diff)
parent905627c7c5d25f6006ff3d757e8800958fc00e14 (diff)
downloadnixlib-ce9d30e7349d0f712ed4ce9e6a20102490d364e9.tar
nixlib-ce9d30e7349d0f712ed4ce9e6a20102490d364e9.tar.gz
nixlib-ce9d30e7349d0f712ed4ce9e6a20102490d364e9.tar.bz2
nixlib-ce9d30e7349d0f712ed4ce9e6a20102490d364e9.tar.lz
nixlib-ce9d30e7349d0f712ed4ce9e6a20102490d364e9.tar.xz
nixlib-ce9d30e7349d0f712ed4ce9e6a20102490d364e9.tar.zst
nixlib-ce9d30e7349d0f712ed4ce9e6a20102490d364e9.zip
Merge #22241: amdgpu-pro: 16.50 -> 16.60
Diffstat (limited to 'nixos/modules/hardware/video')
-rw-r--r--nixos/modules/hardware/video/amdgpu-pro.nix2
-rw-r--r--nixos/modules/hardware/video/ati.nix2
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix
index 06a405ee057f..5cc96d8bd074 100644
--- a/nixos/modules/hardware/video/amdgpu-pro.nix
+++ b/nixos/modules/hardware/video/amdgpu-pro.nix
@@ -21,6 +21,8 @@ in
 
   config = mkIf enabled {
 
+    nixpkgs.config.xorg.abiCompat = "1.18";
+
     services.xserver.drivers = singleton
       { name = "amdgpu"; modules = [ package ]; libPath = [ package ]; };
 
diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix
index bf91bcf0776b..022fdea0a0a3 100644
--- a/nixos/modules/hardware/video/ati.nix
+++ b/nixos/modules/hardware/video/ati.nix
@@ -18,7 +18,7 @@ in
 
   config = mkIf enabled {
 
-    nixpkgs.config.xorg.fglrxCompat = true;
+    nixpkgs.config.xorg.abiCompat = "1.17";
 
     services.xserver.drivers = singleton
       { name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; };