diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 10:12:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 10:12:44 +0200 |
| commit | 05a36304ea812cc891a1d03a497b8ee7ce3729de (patch) | |
| tree | bdf42933d625b313297d3b6db5c773ed8d822e8f | |
| parent | ff2d137410672d7ec50fa7666a39aab2dbd73e91 (diff) | |
| download | nixpkgs-05a36304ea812cc891a1d03a497b8ee7ce3729de.tar nixpkgs-05a36304ea812cc891a1d03a497b8ee7ce3729de.tar.gz nixpkgs-05a36304ea812cc891a1d03a497b8ee7ce3729de.tar.bz2 nixpkgs-05a36304ea812cc891a1d03a497b8ee7ce3729de.tar.lz nixpkgs-05a36304ea812cc891a1d03a497b8ee7ce3729de.tar.xz nixpkgs-05a36304ea812cc891a1d03a497b8ee7ce3729de.tar.zst nixpkgs-05a36304ea812cc891a1d03a497b8ee7ce3729de.zip | |
nixos ati_unfree: auto-switch xorg to fglrxComat
| -rw-r--r-- | nixos/modules/hardware/video/ati.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix index 033e49d2233..bf91bcf0776 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 b1d657215f1..bdffa0f9f2c 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 { }; |