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

Merge pull request #309516 from JohnRTitor/waybar 

waybar: 0.10.2 -> 0.10.3
parents f3b01c62 1490b778

pkgs/by-name/wa/waybar/package.nix

+126 −124
Original line number Diff line number Diff line 
{ lib

, stdenv

, bash

, fetchFromGitHub

, fetchFromGitLab

, SDL2

, alsa-lib

, catch2_3

, fftw

, glib

, gobject-introspection

, gtk-layer-shell

, gtkmm3

, howard-hinnant-date

, hyprland

, iniparser

, jsoncpp

, libdbusmenu-gtk3

, libevdev

, libinotify-kqueue

, libinput

, libjack2

, libmpdclient

, libnl

, libpulseaudio

, libsigcxx

, libxkbcommon

, meson

, ncurses

, ninja

, pipewire

, pkg-config

, playerctl

, portaudio

, python3

, scdoc

, sndio

, spdlog

, sway

, udev

, upower

, wayland

, wayland-scanner

, wireplumber

, wrapGAppsHook3

{

  lib,

  stdenv,

  bash,

  fetchFromGitHub,

  SDL2,

  alsa-lib,

  catch2_3,

  fftw,

  glib,

  gobject-introspection,

  gtk-layer-shell,

  gtkmm3,

  howard-hinnant-date,

  hyprland,

  iniparser,

  jsoncpp,

  libdbusmenu-gtk3,

  libevdev,

  libinotify-kqueue,

  libinput,

  libjack2,

  libmpdclient,

  libnl,

  libpulseaudio,

  libsigcxx,

  libxkbcommon,

  meson,

  ncurses,

  ninja,

  pipewire,

  pkg-config,

  playerctl,

  portaudio,

  python3,

  scdoc,

  sndio,

  spdlog,

  sway,

  udev,

  upower,

  wayland,

  wayland-scanner,

  wireplumber,

  wrapGAppsHook3,



, cavaSupport ? true

, enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform

, evdevSupport ? true

, experimentalPatches ? true

, hyprlandSupport ? true

, inputSupport ? true

, jackSupport ? true

, mpdSupport ? true

, mprisSupport ? stdenv.isLinux

, nlSupport ? true

, pipewireSupport ? true

, pulseSupport ? true

, rfkillSupport ? true

, runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform

, sndioSupport ? true

, swaySupport ? true

, traySupport ? true

, udevSupport ? true

, upowerSupport ? true

, wireplumberSupport ? true

, withMediaPlayer ? mprisSupport && false

, nix-update-script

  cavaSupport ? true,

  enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,

  evdevSupport ? true,

  experimentalPatches ? true,

  hyprlandSupport ? true,

  inputSupport ? true,

  jackSupport ? true,

  mpdSupport ? true,

  mprisSupport ? stdenv.isLinux,

  nlSupport ? true,

  pipewireSupport ? true,

  pulseSupport ? true,

  rfkillSupport ? true,

  runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,

  sndioSupport ? true,

  swaySupport ? true,

  traySupport ? true,

  udevSupport ? true,

  upowerSupport ? true,

  wireplumberSupport ? true,

  withMediaPlayer ? mprisSupport && false,

  nix-update-script,

}:



let
@@ -79,13 +79,13 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "waybar";

  version = "0.10.2";

  version = "0.10.3";



  src = fetchFromGitHub {

    owner = "Alexays";

    repo = "Waybar";

    rev = finalAttrs.version;

    hash = "sha256-xinTLjZJhL4048jpAbN3i6nSxKAqnbesbK/GBX+1CkE=";

    hash = "sha256-LUageV0xC42MldMmYY1njkm95icBsqID1tEGy3wwrRM=";

  };



  postUnpack = lib.optional cavaSupport ''
@@ -101,8 +101,7 @@ stdenv.mkDerivation (finalAttrs: { 
    pkg-config

    wayland-scanner

    wrapGAppsHook3

  ] ++ lib.optional withMediaPlayer gobject-introspection

    ++ lib.optional enableManpages scdoc;

  ] ++ lib.optional withMediaPlayer gobject-introspection ++ lib.optional enableManpages scdoc;



  propagatedBuildInputs = lib.optionals withMediaPlayer [

    glib
@@ -110,7 +109,8 @@ stdenv.mkDerivation (finalAttrs: { 
    python3.pkgs.pygobject3

  ];



  buildInputs = [

  buildInputs =

    [

      gtk-layer-shell

      gtkmm3

      howard-hinnant-date
@@ -148,7 +148,8 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeCheckInputs = [ catch2_3 ];

  doCheck = runTests;



  mesonFlags = (lib.mapAttrsToList lib.mesonEnable {

  mesonFlags =

    (lib.mapAttrsToList lib.mesonEnable {

      "cava" = cavaSupport;

      "dbusmenu-gtk" = traySupport;

      "jack" = jackSupport;
@@ -166,7 +167,8 @@ stdenv.mkDerivation (finalAttrs: { 
      "tests" = runTests;

      "upower_glib" = upowerSupport;

      "wireplumber" = wireplumberSupport;

  }) ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true);

    })

    ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true);



  postPatch = ''

    substituteInPlace include/util/command.hpp \