mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-22 14:45:27 +00:00
Merge pull request #44041 from eadwu/polybar/3.2.0
polybar: 3.1.0 -> 3.2.0
This commit is contained in:
commit
79925f1b2a
|
@ -8,6 +8,7 @@
|
||||||
, iwSupport ? true, wirelesstools ? null
|
, iwSupport ? true, wirelesstools ? null
|
||||||
, githubSupport ? false, curl ? null
|
, githubSupport ? false, curl ? null
|
||||||
, mpdSupport ? false, mpd_clientlib ? null
|
, mpdSupport ? false, mpd_clientlib ? null
|
||||||
|
, pulseSupport ? false, libpulseaudio ? null
|
||||||
, i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null
|
, i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -15,17 +16,18 @@ assert alsaSupport -> alsaLib != null;
|
||||||
assert githubSupport -> curl != null;
|
assert githubSupport -> curl != null;
|
||||||
assert iwSupport -> wirelesstools != null;
|
assert iwSupport -> wirelesstools != null;
|
||||||
assert mpdSupport -> mpd_clientlib != null;
|
assert mpdSupport -> mpd_clientlib != null;
|
||||||
|
assert pulseSupport -> libpulseaudio != null;
|
||||||
|
|
||||||
assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null;
|
assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null;
|
||||||
assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null;
|
assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "polybar-${version}";
|
name = "polybar-${version}";
|
||||||
version = "3.1.0";
|
version = "3.2.0";
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/jaagr/polybar";
|
url = "https://github.com/jaagr/polybar";
|
||||||
rev = "bf16a4d415ea7d8845f578544de0c71e56ad314e";
|
rev = version;
|
||||||
sha256 = "1jcvqxl0477j0snvh1rzqsm1dkfsybix2lgrlsgiczdxfknwz8iy";
|
sha256 = "0p94brndysvmmbidhl4ds4w3qvddb752s4vryp0qckb0hz3knqk8";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
@ -48,6 +50,7 @@ stdenv.mkDerivation rec {
|
||||||
(if githubSupport then curl else null)
|
(if githubSupport then curl else null)
|
||||||
(if iwSupport then wirelesstools else null)
|
(if iwSupport then wirelesstools else null)
|
||||||
(if mpdSupport then mpd_clientlib else null)
|
(if mpdSupport then mpd_clientlib else null)
|
||||||
|
(if pulseSupport then libpulseaudio else null)
|
||||||
|
|
||||||
(if i3Support || i3GapsSupport then jsoncpp else null)
|
(if i3Support || i3GapsSupport then jsoncpp else null)
|
||||||
(if i3Support then i3 else null)
|
(if i3Support then i3 else null)
|
||||||
|
|
Loading…
Reference in a new issue