MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #44861 from jfrankenau/update-polybar

Browse source 
polybar: update and add libnl support
This commit is contained in:
Jörg Thalheim 2018-08-10 13:31:41 +01:00 committed by GitHub
commit 285580c026
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/applications/misc/polybar/default.nix
View file

@ -1,33 +1,36 @@
{ cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
, python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil , python2, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage
, xcbutilwm, xcbutilxrm, makeWrapper , xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper
# optional packages-- override the variables ending in 'Support' to enable or # optional packages-- override the variables ending in 'Support' to enable or
# disable modules # disable modules
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? 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 , pulseSupport ? false, libpulseaudio ? null
, iwSupport ? false, wirelesstools ? null
, nlSupport ? true, libnl ? null
, i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null , i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null
}: }:
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
assert githubSupport -> curl != null; assert githubSupport -> curl != null;
assert iwSupport -> wirelesstools != null;
assert mpdSupport -> mpd_clientlib != null; assert mpdSupport -> mpd_clientlib != null;
assert pulseSupport -> libpulseaudio != null; assert pulseSupport -> libpulseaudio != null;
assert iwSupport -> ! nlSupport && wirelesstools != null;
assert nlSupport -> ! iwSupport && libnl != 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.2.0"; version = "3.2.1";
src = fetchgit { src = fetchgit {
url = "https://github.com/jaagr/polybar"; url = "https://github.com/jaagr/polybar";
rev = version; rev = version;
sha256 = "0p94brndysvmmbidhl4ds4w3qvddb752s4vryp0qckb0hz3knqk8"; sha256 = "1z45swj2l0h8x8li7prl963cgl6zm3birsswpij8qwcmjaj5l8vz";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -44,14 +47,16 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil
xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm
(if alsaSupport then alsaLib else null) (if alsaSupport then alsaLib else null)
(if githubSupport then curl else null) (if githubSupport then curl 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 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 || i3GapsSupport then jsoncpp else null)
(if i3Support then i3 else null) (if i3Support then i3 else null)
(if i3GapsSupport then i3-gaps else null) (if i3GapsSupport then i3-gaps else null)