From b82a8f631952c774c38202afe8a481b3865caf48 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 29 May 2012 07:44:01 +0000 Subject: [PATCH] xmobar: enable optional wireless support svn path=/nixpkgs/trunk/; revision=34268 --- pkgs/applications/misc/xmobar/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 5fa4ecfc3ffe..864e479cc107 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,7 +1,9 @@ { cabal, filepath, libXrandr, mtl, parsec, stm, time, utf8String -, X11, X11Xft +, X11, X11Xft, wirelessSupport ? false, wirelesstools ? null }: +assert wirelessSupport -> wirelesstools != null; + cabal.mkDerivation (self: { pname = "xmobar"; version = "0.14"; @@ -10,9 +12,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"; + configureFlags = ["-fwith_xft"] ++ self.stdenv.lib.optional wirelessSupport "-fwith_iwlib"; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar";