public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages 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:26:25 +02:00
parent af8b7d3a28
commit 22088b4b25
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/x11/xserver.nix
+4 -3
View File
@@ -438,14 +438,15 @@ in
services.xserver.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ]; 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 = let driver =
attrByPath [name] attrByPath [name]
(if xorg ? ${"xf86video" + name} (if xorg ? ${"xf86video" + name}
then { modules = [xorg.${"xf86video" + name}]; } then { modules = [xorg.${"xf86video" + name}]; }
else throw "Unknown video driver: ${name}") else null)
knownVideoDrivers; knownVideoDrivers;
in { inherit name; modules = []; driverName = name; } // driver); in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver));
assertions = assertions =
[ { assertion = config.security.polkit.enable; [ { assertion = config.security.polkit.enable;