Merge pull request #62675 from Synthetica9/waybar067

waybar: 0.6.6 -> 0.6.7
This commit is contained in:
Sarah Brofeldt 2019-06-07 20:44:28 +02:00 committed by GitHub
commit 9e1753f602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9,13 +9,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "waybar-${version}"; name = "waybar-${version}";
version = "0.6.6"; version = "0.6.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alexays"; owner = "Alexays";
repo = "Waybar"; repo = "Waybar";
rev = version; rev = version;
sha256 = "0wxd03lkgssz0vsib9qc040vfg1i6nrg7ac2c6qwficx62j2zlm1"; sha256 = "1rkqxszay2fns8c2q0b668mjacr4wb7drlbfi55z9w5f9cfxgifw";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -31,12 +31,16 @@
++ optional swaySupport sway ++ optional swaySupport sway
++ optional mpdSupport mpd_clientlib; ++ optional mpdSupport mpd_clientlib;
mesonFlags = [ mesonFlags = (stdenv.lib.mapAttrsToList
"-Ddbusmenu-gtk=${ if traySupport then "enabled" else "disabled" }" (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}")
"-Dpulseaudio=${ if pulseSupport then "enabled" else "disabled" }" {
"-Dlibnl=${ if nlSupport then "enabled" else "disabled" }" dbusmenu-gtk = traySupport;
"-Dlibudev=${ if udevSupport then "enabled" else "disabled" }" pulseaudio = pulseSupport;
"-Dmpd=${ if mpdSupport then "enabled" else "disabled" }" libnl = nlSupport;
libudev = udevSupport;
mpd = mpdSupport;
}
) ++ [
"-Dout=${placeholder "out"}" "-Dout=${placeholder "out"}"
]; ];