ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 21:18:28 +03:00
Code Issues Projects Releases Wiki Activity

nixos/x11: make nvidia driver work again

Browse Source 
The nvidia driver module directly sets the services.xserver.drivers
option, while still having nvidia/nvidiaBeta/... etc. in the
videoDrivers option.
This commit is contained in:
Gabriel Ebner 2016-08-06 07:22:33 +02:00
parent af8b7d3a28
commit 22088b4b25
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/x11/xserver.nix
View File

@ -438,14 +438,15 @@ in
services.xserver.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];
services.xserver.drivers = flip map cfg.videoDrivers (name:
# FIXME: somehow check for unknown driver names.
services.xserver.drivers = flip concatMap cfg.videoDrivers (name:
let driver =
attrByPath [name]
(if xorg ? ${"xf86video" + name}
then { modules = [xorg.${"xf86video" + name}]; }
else throw "Unknown video driver: ${name}")
else null)
knownVideoDrivers;
in { inherit name; modules = []; driverName = name; } // driver);
in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver));
assertions =
[ { assertion = config.security.polkit.enable;