summary refs log tree commit diff
path: root/pkgs/applications/misc/polybar
diff options
context:
space:
mode:
authorJohannes Frankenau <johannes@frankenau.net>2018-08-10 09:15:22 +0200
committerJohannes Frankenau <johannes@frankenau.net>2018-08-10 09:15:22 +0200
commita023ec647ffb9a31d1a7eb0c496a2f7487168c91 (patch)
tree8a803b12c24fc50c17e092ae5c438e92240c5394 /pkgs/applications/misc/polybar
parent64134b3a2ca1fff4564ed2901805f72d08d1a8ad (diff)
downloadnixpkgs-a023ec647ffb9a31d1a7eb0c496a2f7487168c91.tar
nixpkgs-a023ec647ffb9a31d1a7eb0c496a2f7487168c91.tar.gz
nixpkgs-a023ec647ffb9a31d1a7eb0c496a2f7487168c91.tar.bz2
nixpkgs-a023ec647ffb9a31d1a7eb0c496a2f7487168c91.tar.lz
nixpkgs-a023ec647ffb9a31d1a7eb0c496a2f7487168c91.tar.xz
nixpkgs-a023ec647ffb9a31d1a7eb0c496a2f7487168c91.tar.zst
nixpkgs-a023ec647ffb9a31d1a7eb0c496a2f7487168c91.zip
polybar: add and enable libnl support
Diffstat (limited to 'pkgs/applications/misc/polybar')
-rw-r--r--pkgs/applications/misc/polybar/default.nix17
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 5c116f16303..0c358e4221a 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -1,23 +1,26 @@
 { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
-, python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil
-, xcbutilwm, xcbutilxrm, makeWrapper
+, python2, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage
+, xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper
 
 # optional packages-- override the variables ending in 'Support' to enable or
 # disable modules
 , alsaSupport   ? true,  alsaLib       ? null
-, iwSupport     ? true,  wirelesstools ? null
 , githubSupport ? false, curl          ? null
 , mpdSupport    ? false, mpd_clientlib ? null
 , pulseSupport  ? false, libpulseaudio ? null
+, iwSupport     ? false, wirelesstools ? null
+, nlSupport     ? true,  libnl         ? null
 , i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null
 }:
 
 assert alsaSupport   -> alsaLib       != null;
 assert githubSupport -> curl          != null;
-assert iwSupport     -> wirelesstools != null;
 assert mpdSupport    -> mpd_clientlib != null;
 assert pulseSupport  -> libpulseaudio != null;
 
+assert iwSupport     -> ! nlSupport && wirelesstools != null;
+assert nlSupport     -> ! iwSupport && libnl         != null;
+
 assert i3Support     -> ! i3GapsSupport && jsoncpp != null && i3      != null;
 assert i3GapsSupport -> ! i3Support     && jsoncpp != null && i3-gaps != null;
 
@@ -44,14 +47,16 @@ stdenv.mkDerivation rec {
 
     buildInputs = [
       cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil
-      xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm
+      xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm
 
       (if alsaSupport   then alsaLib       else null)
       (if githubSupport then curl          else null)
-      (if iwSupport     then wirelesstools else null)
       (if mpdSupport    then mpd_clientlib else null)
       (if pulseSupport  then libpulseaudio else null)
 
+      (if iwSupport     then wirelesstools else null)
+      (if nlSupport     then libnl         else null)
+
       (if i3Support || i3GapsSupport then jsoncpp else null)
       (if i3Support then i3 else null)
       (if i3GapsSupport then i3-gaps else null)