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

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

View file

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