Merge pull request #44861 from jfrankenau/update-polybar

polybar: update and add libnl support

Changed files
+13 -8
pkgs
applications
misc
polybar
+13 -8
pkgs/applications/misc/polybar/default.nix
···
{ 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; {
···
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)