From 05a36304ea812cc891a1d03a497b8ee7ce3729de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 23 May 2016 10:12:44 +0200 Subject: [PATCH] nixos ati_unfree: auto-switch xorg to fglrxComat --- nixos/modules/hardware/video/ati.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix index 033e49d2233e..bf91bcf0776b 100644 --- a/nixos/modules/hardware/video/ati.nix +++ b/nixos/modules/hardware/video/ati.nix @@ -18,6 +18,8 @@ in config = mkIf enabled { + nixpkgs.config.xorg.fglrxCompat = true; + services.xserver.drivers = singleton { name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1d657215f17..bdffa0f9f2c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10268,7 +10268,7 @@ in mesa = mesa_noglu; udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; - fglrxCompat = false; + fglrxCompat = config.xorg.fglrxCompat or false; # `config` because we have no `xorg.override` } // { inherit xlibsWrapper; } ); xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };