Unverified Commit 70c4a233 authored by Vlad M's avatar Vlad M Committed by GitHub
Browse files

Merge pull request #234810 from teutat3s/waybar-0.9.18 

waybar: 0.9.17 -> 0.9.18
parents 1ef1ad78 4492a5f9

pkgs/applications/misc/waybar/default.nix

+31 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
, howard-hinnant-date

, libinotify-kqueue

, libxkbcommon

, cavaSupport     ? true,  alsa-lib, fftw, iniparser, ncurses, pipewire, portaudio, SDL2

, evdevSupport    ? true,  libevdev

, inputSupport    ? true,  libinput

, jackSupport     ? true,  libjack2
@@ -33,18 +34,37 @@ 
, wireplumberSupport ? true, wireplumber

, withMediaPlayer ? mprisSupport && false, glib, gobject-introspection, python3

}:



let

  # Derived from subprojects/cava.wrap

  libcava = rec {

    version = "0.8.4";

    src = fetchFromGitHub {

      owner = "LukashonakV";

      repo = "cava";

      rev = version;

      hash = "sha256-66uc0CEriV9XOjSjFTt+bxghEXY1OGrpjd+7d6piJUI=";

    };

  };

in

stdenv.mkDerivation rec {

  pname = "waybar";

  version = "0.9.17";

  version = "0.9.18";



  src = fetchFromGitHub {

    owner = "Alexays";

    repo = "Waybar";

    rev = version;

    hash = "sha256-sdNenmzI/yvN9w4Z83ojDJi+2QBx2hxhJQCFkc5kCZw=";

    hash = "sha256-bnaYNa1jb7kZ1mtMzeOQqz4tmBG1w5YXlQWoop1Q0Yc=";

  };



  postUnpack = lib.optional cavaSupport ''

    (

      cd "$sourceRoot"

      cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.8.4

      patchShebangs .

    )

  '';



  nativeBuildInputs = [

    meson ninja pkg-config scdoc wrapGAppsHook

  ] ++ lib.optional withMediaPlayer gobject-introspection;
@@ -60,6 +80,13 @@ stdenv.mkDerivation rec { 
  buildInputs = with lib;

    [ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]

    ++ optional  (!stdenv.isLinux) libinotify-kqueue

    ++ optional  cavaSupport   alsa-lib

    ++ optional  cavaSupport   iniparser

    ++ optional  cavaSupport   fftw

    ++ optional  cavaSupport   ncurses

    ++ optional  cavaSupport   pipewire

    ++ optional  cavaSupport   portaudio

    ++ optional  cavaSupport   SDL2

    ++ optional  evdevSupport  libevdev

    ++ optional  inputSupport  libinput

    ++ optional  jackSupport   libjack2
@@ -80,6 +107,7 @@ stdenv.mkDerivation rec { 
  mesonFlags = (lib.mapAttrsToList

    (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}")

    {

      cava = cavaSupport;

      dbusmenu-gtk = traySupport;

      jack = jackSupport;

      libinput = inputSupport;