From 77d3ac188fbff8ab565f8e11c5962c99b9c831e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 May 2023 05:52:15 +0000
Subject: [PATCH 1/2] swayrbar: 0.3.5 -> 0.3.6

---
 pkgs/tools/wayland/swayrbar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix
index 76a49cad8a84..72f2d8b93be3 100644
--- a/pkgs/tools/wayland/swayrbar/default.nix
+++ b/pkgs/tools/wayland/swayrbar/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "swayrbar";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromSourcehut {
     owner = "~tsdh";
     repo = "swayr";
     rev = "swayrbar-${version}";
-    sha256 = "sha256-uYQGwccSwqHJ1w8CyxXimmENnGx7e3EMA1MKZuZDTIk=";
+    sha256 = "sha256-Vv+Hw+iJAi2GnfkiYitDyH3H58tydUDa6GcWITok7Oc=";
   };
 
-  cargoHash = "sha256-PdPaUqJUycUhleaND6XwKkRvwO0MHbvw5lzz95bdfCQ=";
+  cargoHash = "sha256-5alzkHzwuymo6bXFgabYQ3LWJDib0+ESQCSIPmINViY=";
 
   # don't build swayr
   buildAndTestSubdir = pname;

From 5610d2ec67a4b54bfdf722cb3a2afd8342ee56fe Mon Sep 17 00:00:00 2001
From: Sebastian Sellmeier <mail@sebastian-sellmeier.de>
Date: Tue, 16 May 2023 10:52:13 +0200
Subject: [PATCH 2/2] swayrbar: Fix pulseaudio as optional dependency (default:
 disabled)

---
 pkgs/tools/wayland/swayrbar/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix
index 72f2d8b93be3..79cc1635a9cd 100644
--- a/pkgs/tools/wayland/swayrbar/default.nix
+++ b/pkgs/tools/wayland/swayrbar/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromSourcehut, rustPlatform }:
+{ lib, fetchFromSourcehut, rustPlatform, makeWrapper, withPulseaudio ? false, pulseaudio }:
 
 rustPlatform.buildRustPackage rec {
   pname = "swayrbar";
@@ -16,10 +16,17 @@ rustPlatform.buildRustPackage rec {
   # don't build swayr
   buildAndTestSubdir = pname;
 
+  nativeBuildInputs = [ makeWrapper ];
+
   preCheck = ''
     export HOME=$TMPDIR
   '';
 
+  postInstall = lib.optionals withPulseaudio ''
+    wrapProgram "$out/bin/swayrbar" \
+      --prefix PATH : "$out/bin:${lib.makeBinPath [ pulseaudio ]}"
+  '';
+
   meta = with lib; {
     description = "Status command for sway's swaybar implementing the swaybar-protocol";
     homepage = "https://git.sr.ht/~tsdh/swayr#a-idswayrbarswayrbara";