treewide: Fix more lib.optional misuses

pkgs/applications/misc/webthree-umbrella/default.nix

@@ -84,22 +84,10 @@ stdenv.mkDerivation rec {
     curl
     libmicrohttpd
     mesa
-    (optional withOpenCL [
+  ] ++ optionals withOpenCL [ opencl-headers ocl-icd ]
-      opencl-headers
+    ++ optionals withGUI [ qtwebengine qtbase qtdeclarative ]
-      ocl-icd
+    ++ optional withProfiling gperftools
-    ])
+    ++ optionals withEVMJIT [ llvm zlib ncurses ];
-    (optional withGUI [
-      qtwebengine
-      qtbase
-      qtdeclarative
-    ])
-    (optional withProfiling gperftools)
-    (optional withEVMJIT [
-      llvm
-      zlib
-      ncurses
-    ])
-  ];
 
   runPath = with stdenv.lib; (makeLibraryPath (flatten [ stdenv.cc.cc buildInputs ]));
 

pkgs/development/libraries/blitz/default.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ];
 
   buildInputs = [ pkgconfig gfortran texinfo ]
-    ++ optional (boost != null) [ boost.out ];
+    ++ optional (boost != null) boost;
 
   configureFlags =
     [ "--enable-shared"

pkgs/os-specific/linux/guvcview/default.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       portaudio
       udev
       gsl
-    ] ++ stdenv.lib.optional pulseaudioSupport [ libpulseaudio ];
+    ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio;
 
   meta = {
     description = "A simple interface for devices supported by the linux UVC driver";

pkgs/servers/freeradius/default.nix

@@ -15,6 +15,7 @@
 , withRedis ? false
 , libmysql
 , withMysql ? false
+, json_c
 , withJson ? false
 , libyubikey
 , withYubikey ? false
@@ -42,16 +43,16 @@ stdenv.mkDerivation rec {
   version = "3.0.11";
 
   buildInputs = [ autoreconfHook openssl talloc finger_bsd perl ]
-    ++ optional withLdap [ openldap ]
+    ++ optional withLdap openldap
-    ++ optional withSqlite [ sqlite ]
+    ++ optional withSqlite sqlite
-    ++ optional withPcap [ libpcap ]
+    ++ optional withPcap libpcap
-    ++ optional withCap [ libcap ]
+    ++ optional withCap libcap
-    ++ optional withMemcached [ libmemcached ]
+    ++ optional withMemcached libmemcached
-    ++ optional withRedis [ hiredis ]
+    ++ optional withRedis hiredis
-    ++ optional withMysql [ libmysql ]
+    ++ optional withMysql libmysql
-    ++ optional withJson [ pkgs."json-c" ]
+    ++ optional withJson json_c
-    ++ optional withYubikey [ libyubikey ]
+    ++ optional withYubikey libyubikey
-    ++ optional withCollectd [ collectd ];
+    ++ optional withCollectd collectd;
 
   # NOTE: are the --with-{lib}-lib-dir and --with-{lib}-include-dir necessary with buildInputs ?
 

pkgs/tools/archivers/dar/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
-    ++ stdenv.lib.optional stdenv.isLinux [ attr e2fsprogs ];
+    ++ stdenv.lib.optionals stdenv.isLinux [ attr e2fsprogs ];
 
   configureFlags = [ "--disable-dar-static" ];
 

pkgs/tools/misc/alarm-clock-applet/default.nix

@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
     glib
     gtk2
     gst_all_1.gstreamer
-    gst_plugins
     gnome2.GConf
     gnome2.gnome_icon_theme
     libnotify
@@ -37,7 +36,7 @@ stdenv.mkDerivation rec {
     libunique
     intltool
     wrapGAppsHook
-  ];
+  ] ++ gst_plugins;
 
   propagatedUserEnvPkgs = [ gnome2.GConf.out ];