xmobar: re-generated expression with the latest version of Cabal2Nix

This change enables wireless support unconditionally.

svn path=/nixpkgs/trunk/; revision=34327

1 files changed, 4 insertions, 6 deletions

diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 864e479cc107..9df8f9c49e37 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,9 +1,7 @@
 { cabal, filepath, libXrandr, mtl, parsec, stm, time, utf8String
-, X11, X11Xft, wirelessSupport ? false, wirelesstools ? null
+, wirelesstools, X11, X11Xft
 }:
 
-assert wirelessSupport -> wirelesstools != null;
-
 cabal.mkDerivation (self: {
   pname = "xmobar";
   version = "0.14";
@@ -12,9 +10,9 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [
     filepath mtl parsec stm time utf8String X11 X11Xft
-  ] ++ self.stdenv.lib.optional wirelessSupport wirelesstools;
-  extraLibraries = [ libXrandr ];
-  configureFlags = ["-fwith_xft"] ++ self.stdenv.lib.optional wirelessSupport "-fwith_iwlib";
+  ];
+  extraLibraries = [ libXrandr wirelesstools ];
+  configureFlags = "-fwith_xft -fwith_iwlib";
   meta = {
     homepage = "http://projects.haskell.org/xmobar/";
     description = "A Minimalistic Text Based Status Bar";