Unverified Commit 007e9161 authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

waybar: add systemdSupport input (#345107)

parents b5c4f45c 5fcc1337

nixos/modules/programs/wayland/waybar.nix

+5 −1
Original line number Diff line number Diff line
@@ -11,7 +11,11 @@ in 
{

  options.programs.waybar = {

    enable = lib.mkEnableOption "waybar, a highly customizable Wayland bar for Sway and Wlroots based compositors";

    package = lib.mkPackageOption pkgs "waybar" { };

    package =

      lib.mkPackageOption pkgs "waybar" { }

      // lib.mkOption {

        apply = pkg: pkg.override { systemdSupport = true; };

      };

  };



  config = lib.mkIf cfg.enable {

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

+7 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
  scdoc,

  sndio,

  spdlog,

  systemdMinimal,

  sway,

  udev,

  upower,
@@ -60,6 +61,7 @@ 
  rfkillSupport ? true,

  runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,

  sndioSupport ? true,

  systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal,

  swaySupport ? true,

  traySupport ? true,

  udevSupport ? true,
@@ -153,6 +155,7 @@ stdenv.mkDerivation (finalAttrs: { 
    ++ lib.optional pulseSupport libpulseaudio

    ++ lib.optional sndioSupport sndio

    ++ lib.optional swaySupport sway

    ++ lib.optional systemdSupport systemdMinimal

    ++ lib.optional traySupport libdbusmenu-gtk3

    ++ lib.optional udevSupport udev

    ++ lib.optional upowerSupport upower
@@ -179,14 +182,16 @@ stdenv.mkDerivation (finalAttrs: { 
      "pulseaudio" = pulseSupport;

      "rfkill" = rfkillSupport;

      "sndio" = sndioSupport;

      "systemd" = true;

      "systemd" = systemdSupport;

      "tests" = runTests;

      "upower_glib" = upowerSupport;

      "wireplumber" = wireplumberSupport;

    })

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



  env = lib.optionalAttrs systemdSupport {

    PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";

  };



  postPatch = ''

    substituteInPlace include/util/command.hpp \