public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bad use of pkgs.lib.optional. (detect with bad type error on x11Packages)

Browse Source 
svn path=/nixos/branches/modular-nixos/; revision=16053
This commit is contained in:
Nicolas Pierron 2009-06-26 12:14:02 +00:00
parent 0d5ea86748
commit 5f59ac0447
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/services/x11/xserver/default.nix
View File

@ -322,7 +322,7 @@ let
xorg.xf86inputevdev xorg.xf86inputevdev
] ]
++ attrByPath ["modules"] [] videoDriverModules ++ attrByPath ["modules"] [] videoDriverModules
++ (optional cfg.synaptics.enable ["${xorg.xf86inputsynaptics}"]); ++ optional cfg.synaptics.enable xorg.xf86inputsynaptics;
fontsForXServer = fontsForXServer =
@ -544,9 +544,7 @@ mkIf cfg.enable {
xorg.setxkbmap xorg.setxkbmap
xorg.iceauth # required for KDE applications (it's called by dcopserver) xorg.iceauth # required for KDE applications (it's called by dcopserver)
] ]
++ optional (videoDriver == "nvidia") [ ++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11;
kernelPackages.nvidia_x11
];
extraPackages = config.environment.x11Packages; extraPackages = config.environment.x11Packages;
}; };