mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity

nixos ati_unfree: auto-switch xorg to fglrxComat

Browse source
This commit is contained in:
Vladimír Čunát 2016-05-23 10:12:44 +02:00
parent ff2d137410
commit 05a36304ea
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/hardware/video/ati.nix
View file

@ -18,6 +18,8 @@ in
config = mkIf enabled { config = mkIf enabled {
nixpkgs.config.xorg.fglrxCompat = true;
services.xserver.drivers = singleton services.xserver.drivers = singleton
{ name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; }; { name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; };

2
pkgs/top-level/all-packages.nix
View file

@ -10268,7 +10268,7 @@ in
mesa = mesa_noglu; mesa = mesa_noglu;
udev = if stdenv.isLinux then udev else null; udev = if stdenv.isLinux then udev else null;
libdrm = if stdenv.isLinux then libdrm 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; } ); } // { inherit xlibsWrapper; } );
xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };