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

This change enables wireless support unconditionally.

svn path=/nixpkgs/trunk/; revision=34327
This commit is contained in:
Peter Simons 2012-06-03 18:52:38 +00:00
parent 53d7bcb206
commit 678c30c050

View File

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