diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-08-10 13:31:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-10 13:31:41 +0100 |
commit | 285580c0262dae87fe26fc28303b52d6b46f549b (patch) | |
tree | 90269e071bbc4cfd8c898e5a2ab3fe6c5842b9da /pkgs/applications | |
parent | a9c48a0ad332f2738801f77ae2d9326b9520f227 (diff) | |
parent | a023ec647ffb9a31d1a7eb0c496a2f7487168c91 (diff) | |
download | nixlib-285580c0262dae87fe26fc28303b52d6b46f549b.tar nixlib-285580c0262dae87fe26fc28303b52d6b46f549b.tar.gz nixlib-285580c0262dae87fe26fc28303b52d6b46f549b.tar.bz2 nixlib-285580c0262dae87fe26fc28303b52d6b46f549b.tar.lz nixlib-285580c0262dae87fe26fc28303b52d6b46f549b.tar.xz nixlib-285580c0262dae87fe26fc28303b52d6b46f549b.tar.zst nixlib-285580c0262dae87fe26fc28303b52d6b46f549b.zip |
Merge pull request #44861 from jfrankenau/update-polybar
polybar: update and add libnl support
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/polybar/default.nix | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 347b77c7ab4a..0c358e4221a1 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,33 +1,36 @@ { 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; stdenv.mkDerivation rec { name = "polybar-${version}"; - version = "3.2.0"; + version = "3.2.1"; src = fetchgit { url = "https://github.com/jaagr/polybar"; rev = version; - sha256 = "0p94brndysvmmbidhl4ds4w3qvddb752s4vryp0qckb0hz3knqk8"; + sha256 = "1z45swj2l0h8x8li7prl963cgl6zm3birsswpij8qwcmjaj5l8vz"; }; meta = with stdenv.lib; { @@ -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) |