Commit edf73b45 authored by Anderson Torres's avatar Anderson Torres
Browse files

waybar: refactor 

- Reorder argument list
- Use rec-less, overlay-style overridable recursive attributes (in effect since
NixOS#119942);
- Use pushd/popd instead of subshell
- Use lib.mesonEnable and lib.mesonBool
- Indentation
- Remove nested `with`
parent 710f512b

pkgs/applications/misc/waybar/default.nix

+145 −103
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, meson

, pkg-config

, ninja

, wrapGAppsHook

, wayland

, wlroots

, gtkmm3

, libsigcxx

, jsoncpp

, scdoc

, spdlog

, 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

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

, evdevSupport    ? true,  libevdev

, hyprlandSupport ? false, hyprland

, inputSupport    ? true,  libinput

, jackSupport     ? true,  libjack2

, mpdSupport      ? true,  libmpdclient

, mprisSupport    ? stdenv.isLinux, playerctl ? false

, nlSupport       ? true,  libnl

, pulseSupport    ? true,  libpulseaudio

, meson

, ncurses

, ninja

, pipewire

, pkg-config

, playerctl

, portaudio

, python3

, scdoc

, sndio

, spdlog

, sway

, udev

, upower

, wayland

, wireplumber

, wlroots

, wrapGAppsHook



, cavaSupport ? true

, evdevSupport ? true

, hyprlandSupport ? false

, inputSupport ? true

, jackSupport ? true

, mpdSupport ? true

, mprisSupport ? stdenv.isLinux

, nlSupport ? true

, pulseSupport ? true

, rfkillSupport ? true

, runTests        ? true,  catch2_3

, sndioSupport    ? true,  sndio

, swaySupport     ? true,  sway

, traySupport     ? true,  libdbusmenu-gtk3

, udevSupport     ? true,  udev

, upowerSupport   ? true,  upower

, wireplumberSupport ? true, wireplumber

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

, runTests ? true

, sndioSupport ? true

, swaySupport ? true

, traySupport ? true

, udevSupport ? true

, upowerSupport ? true

, wireplumberSupport ? true

, withMediaPlayer ? mprisSupport && false

}:



let

  # Derived from subprojects/cava.wrap

  libcava = rec {

    version = "0.8.5";

    src = fetchFromGitHub {

  libcava.src = fetchFromGitHub {

    owner = "LukashonakV";

    repo = "cava";

      rev = version;

    rev = "0.8.5";

    hash = "sha256-b/XfqLh8PnW018sGVKRRlFvBpo2Ru1R2lUeTR7pugBo=";

  };

  };

in

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "waybar";

  version = "0.9.22";



  src = fetchFromGitHub {

    owner = "Alexays";

    repo = "Waybar";

    rev = version;

    rev = finalAttrs.version;

    hash = "sha256-9LJDA+zrHF9Mn8+W9iUw50LvO+xdT7/l80KdltPrnDo=";

  };



  postUnpack = lib.optional cavaSupport ''

    (

      cd "$sourceRoot"

    pushd "$sourceRoot"

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

    patchShebangs .

    )

    popd

  '';



  # Patch for workspaces support in wlr/workspaces
@@ -71,7 +94,11 @@ stdenv.mkDerivation rec { 
  patches = lib.optional hyprlandSupport [ ./hyprland.diff ];



  nativeBuildInputs = [

    meson ninja pkg-config scdoc wrapGAppsHook

    meson

    ninja

    pkg-config

    scdoc

    wrapGAppsHook

  ] ++ lib.optional withMediaPlayer gobject-introspection;



  propagatedBuildInputs = lib.optionals withMediaPlayer [
@@ -82,57 +109,65 @@ stdenv.mkDerivation rec { 


  strictDeps = false;



  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  hyprlandSupport hyprland

    ++ optional  inputSupport  libinput

    ++ optional  jackSupport   libjack2

    ++ optional  mpdSupport    libmpdclient

    ++ optional  mprisSupport  playerctl

    ++ optional  nlSupport     libnl

    ++ optional  pulseSupport  libpulseaudio

    ++ optional  sndioSupport  sndio

    ++ optional  swaySupport   sway

    ++ optional  traySupport   libdbusmenu-gtk3

    ++ optional  udevSupport   udev

    ++ optional  upowerSupport upower

    ++ optional  wireplumberSupport wireplumber;

  buildInputs = [

    gtk-layer-shell

    gtkmm3

    howard-hinnant-date

    jsoncpp

    libsigcxx

    libxkbcommon

    spdlog

    wayland

    wlroots

  ]

  ++ lib.optionals cavaSupport  [

    SDL2

    alsa-lib

    fftw

    iniparser

    ncurses

    pipewire

    portaudio

  ]

  ++ lib.optional evdevSupport libevdev

  ++ lib.optional hyprlandSupport hyprland

  ++ lib.optional inputSupport libinput

  ++ lib.optional jackSupport libjack2

  ++ lib.optional mpdSupport libmpdclient

  ++ lib.optional mprisSupport playerctl

  ++ lib.optional nlSupport libnl

  ++ lib.optional pulseSupport libpulseaudio

  ++ lib.optional sndioSupport sndio

  ++ lib.optional swaySupport sway

  ++ lib.optional traySupport libdbusmenu-gtk3

  ++ lib.optional udevSupport udev

  ++ lib.optional upowerSupport upower

  ++ lib.optional wireplumberSupport wireplumber

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



  nativeCheckInputs = [ catch2_3 ];

  doCheck = runTests;



  mesonFlags = (lib.mapAttrsToList

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

    {

      cava = cavaSupport;

      dbusmenu-gtk = traySupport;

      jack = jackSupport;

      libinput = inputSupport;

      libnl = nlSupport;

      libudev = udevSupport;

      mpd = mpdSupport;

      mpris = mprisSupport;

      pulseaudio = pulseSupport;

      rfkill = rfkillSupport;

      sndio = sndioSupport;

      tests = runTests;

      upower_glib = upowerSupport;

      wireplumber = wireplumberSupport;

    }

  ) ++ [

    "-Dsystemd=disabled"

    "-Dgtk-layer-shell=enabled"

    "-Dman-pages=enabled"

  ] ++ lib.optional hyprlandSupport "-Dexperimental=true";

  mesonFlags = (lib.mapAttrsToList lib.mesonEnable {

    "cava" = cavaSupport;

    "dbusmenu-gtk" = traySupport;

    "gtk-layer-shell" = true;

    "jack" = jackSupport;

    "libinput" = inputSupport;

    "libnl" = nlSupport;

    "libudev" = udevSupport;

    "man-pages" = true;

    "mpd" = mpdSupport;

    "mpris" = mprisSupport;

    "pulseaudio" = pulseSupport;

    "rfkill" = rfkillSupport;

    "sndio" = sndioSupport;

    "systemd" = false;

    "tests" = runTests;

    "upower_glib" = upowerSupport;

    "wireplumber" = wireplumberSupport;

  })

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



  preFixup = lib.optionalString withMediaPlayer ''

    cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py
@@ -141,13 +176,20 @@ stdenv.mkDerivation rec { 
      --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}"

  '';



  meta = with lib; {

    changelog = "https://github.com/alexays/waybar/releases/tag/${version}";

    description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";

    license = licenses.mit;

    maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault rodrgz jtbx ];

    platforms = platforms.unix;

  meta = {

    homepage = "https://github.com/alexays/waybar";

    description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";

    changelog = "https://github.com/alexays/waybar/releases/tag/${finalAttrs.version}";

    license = lib.licenses.mit;

    mainProgram = "waybar";

    maintainers = with lib.maintainers; [

      FlorianFranzen

      jtbx

      lovesegfault

      minijackson

      rodrgz

      synthetica

    ];

    inherit (wlroots.meta) platforms;

  };

}
 
})