From 5f59ac0447ddefde983e722ad84e152d9bd7bad6 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 26 Jun 2009 12:14:02 +0000
Subject: [PATCH] Fix a bad use of pkgs.lib.optional. (detect with bad type
 error on x11Packages)

svn path=/nixos/branches/modular-nixos/; revision=16053
---
 modules/services/x11/xserver/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index ccbec555ce6..225799c1a52 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -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;
   };