waybar: mpd_clientlib -> libmpdclient

+68 -53
+68 -53
pkgs/applications/misc/waybar/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, wrapGAppsHook 2 - , wayland, wlroots, gtkmm3, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , meson 5 + , pkg-config 6 + , ninja 7 + , wrapGAppsHook 8 + , wayland 9 + , wlroots 10 + , gtkmm3 11 + , libsigcxx 12 + , jsoncpp 13 + , fmt 14 + , scdoc 15 + , spdlog 16 + , gtk-layer-shell 3 17 , howard-hinnant-date, cmake 4 18 , traySupport ? true, libdbusmenu-gtk3 5 19 , pulseSupport ? true, libpulseaudio ··· 7 21 , nlSupport ? true, libnl 8 22 , udevSupport ? true, udev 9 23 , swaySupport ? true, sway 10 - , mpdSupport ? true, mpd_clientlib 24 + , mpdSupport ? true, libmpdclient 11 25 , withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl 12 26 }: 13 - stdenv.mkDerivation rec { 14 - pname = "waybar"; 15 - version = "0.9.5"; 27 + 28 + stdenv.mkDerivation rec { 29 + pname = "waybar"; 30 + version = "0.9.5"; 16 31 17 - src = fetchFromGitHub { 18 - owner = "Alexays"; 19 - repo = "Waybar"; 20 - rev = version; 21 - sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q"; 22 - }; 32 + src = fetchFromGitHub { 33 + owner = "Alexays"; 34 + repo = "Waybar"; 35 + rev = version; 36 + sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q"; 37 + }; 23 38 24 - nativeBuildInputs = [ 25 - meson ninja pkg-config scdoc wrapGAppsHook cmake 26 - ] ++ lib.optional withMediaPlayer gobject-introspection; 39 + nativeBuildInputs = [ 40 + meson ninja pkg-config scdoc wrapGAppsHook cmake 41 + ] ++ lib.optional withMediaPlayer gobject-introspection; 27 42 28 - propagatedBuildInputs = lib.optionals withMediaPlayer [ 29 - glib 30 - playerctl 31 - python38Packages.pygobject3 32 - ]; 33 - strictDeps = false; 43 + propagatedBuildInputs = lib.optionals withMediaPlayer [ 44 + glib 45 + playerctl 46 + python38Packages.pygobject3 47 + ]; 48 + strictDeps = false; 34 49 35 - buildInputs = with lib; 36 - [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] 37 - ++ optional traySupport libdbusmenu-gtk3 38 - ++ optional pulseSupport libpulseaudio 39 - ++ optional sndioSupport sndio 40 - ++ optional nlSupport libnl 41 - ++ optional udevSupport udev 42 - ++ optional swaySupport sway 43 - ++ optional mpdSupport mpd_clientlib; 50 + buildInputs = with lib; 51 + [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] 52 + ++ optional traySupport libdbusmenu-gtk3 53 + ++ optional pulseSupport libpulseaudio 54 + ++ optional sndioSupport sndio 55 + ++ optional nlSupport libnl 56 + ++ optional udevSupport udev 57 + ++ optional swaySupport sway 58 + ++ optional mpdSupport libmpdclient; 44 59 45 - mesonFlags = (lib.mapAttrsToList 46 - (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") 47 - { 48 - dbusmenu-gtk = traySupport; 49 - pulseaudio = pulseSupport; 50 - sndio = sndioSupport; 51 - libnl = nlSupport; 52 - libudev = udevSupport; 53 - mpd = mpdSupport; 54 - } 55 - ) ++ [ 56 - "-Dout=${placeholder "out"}" 57 - "-Dsystemd=disabled" 58 - ]; 60 + mesonFlags = (lib.mapAttrsToList 61 + (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") 62 + { 63 + dbusmenu-gtk = traySupport; 64 + pulseaudio = pulseSupport; 65 + sndio = sndioSupport; 66 + libnl = nlSupport; 67 + libudev = udevSupport; 68 + mpd = mpdSupport; 69 + } 70 + ) ++ [ 71 + "-Dout=${placeholder "out"}" 72 + "-Dsystemd=disabled" 73 + ]; 59 74 60 - preFixup = lib.optional withMediaPlayer '' 75 + preFixup = lib.optional withMediaPlayer '' 61 76 cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py 62 77 63 78 wrapProgram $out/bin/waybar-mediaplayer.py \ 64 79 --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" 65 80 ''; 66 81 67 - meta = with lib; { 68 - description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; 69 - license = licenses.mit; 70 - maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ]; 71 - platforms = platforms.unix; 72 - homepage = "https://github.com/alexays/waybar"; 73 - }; 74 - } 82 + meta = with lib; { 83 + description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; 84 + license = licenses.mit; 85 + maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ]; 86 + platforms = platforms.unix; 87 + homepage = "https://github.com/alexays/waybar"; 88 + }; 89 + }