From 02459909ce7c7402a52697c590b1ca4d55d5d73f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Aug 2023 03:17:02 +0000
Subject: [PATCH 1/5] mpd-mpris: 0.4.0-2 -> 0.4.1

---
 pkgs/tools/audio/mpd-mpris/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix
index 39dbcb952329..616c860c4302 100644
--- a/pkgs/tools/audio/mpd-mpris/default.nix
+++ b/pkgs/tools/audio/mpd-mpris/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "mpd-mpris";
-  version = "0.4.0-2";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "natsukagami";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-RGuscED0RvA1+5Aj+Kcnk1h/whU4npJ6hPq8GHWwxPU=";
+    sha256 = "sha256-QxPkGWpCWiyEbChH9SHeD+SiV8k0c/G7MG/azksP3xU=";
   };
 
-  vendorHash = "sha256-GmdD/4VYp3KeblNGgltFWHdOnK5qsBa2ygIYOBrH+b0=";
+  vendorHash = "sha256-HCDJrp9WFB1z+FnYpOI5e/AojtdnpN2ZNtgGVaH/v/Q=";
 
   doCheck = false;
 

From 6f8f675bdf3d205913441f2c60c5dfb9c01a3a21 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 30 Aug 2023 09:57:24 +0300
Subject: [PATCH 2/5] mpd-mpris: Format package arguments

---
 pkgs/tools/audio/mpd-mpris/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix
index 616c860c4302..76e81783bf82 100644
--- a/pkgs/tools/audio/mpd-mpris/default.nix
+++ b/pkgs/tools/audio/mpd-mpris/default.nix
@@ -1,4 +1,8 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, fetchpatch
+}:
 
 buildGoModule rec {
   pname = "mpd-mpris";

From 4c8c2b7baae2645ba72534cbe6828515423890ef Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 30 Aug 2023 09:59:18 +0300
Subject: [PATCH 3/5] mpd-mpris: use upstream patch for Exec path fix

---
 pkgs/tools/audio/mpd-mpris/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix
index 76e81783bf82..a261e6a785f1 100644
--- a/pkgs/tools/audio/mpd-mpris/default.nix
+++ b/pkgs/tools/audio/mpd-mpris/default.nix
@@ -15,6 +15,14 @@ buildGoModule rec {
     sha256 = "sha256-QxPkGWpCWiyEbChH9SHeD+SiV8k0c/G7MG/azksP3xU=";
   };
 
+  patches = [
+    # Makes Exec= path not absolute, see https://github.com/natsukagami/mpd-mpris/pull/42
+    (fetchpatch {
+      url = "https://github.com/natsukagami/mpd-mpris/commit/8a5b53b1aa3174c3ccb1db24fb4e39f90012b98f.patch";
+      hash = "sha256-LArPq+RRPJOs0je1olqg+pK7nvU7UIlrpGtHv2PhIY4=";
+    })
+  ];
+
   vendorHash = "sha256-HCDJrp9WFB1z+FnYpOI5e/AojtdnpN2ZNtgGVaH/v/Q=";
 
   doCheck = false;
@@ -22,8 +30,6 @@ buildGoModule rec {
   subPackages = [ "cmd/${pname}" ];
 
   postInstall = ''
-    substituteInPlace mpd-mpris.service \
-      --replace /usr/bin $out/bin
     mkdir -p $out/lib/systemd/user
     cp mpd-mpris.service $out/lib/systemd/user
   '';

From 43cab234c17bad00adfce1df84b9f2cd81f8bd28 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 30 Aug 2023 09:59:50 +0300
Subject: [PATCH 4/5] mpd-mpris: use `install` to install mpd-mpris.service

---
 pkgs/tools/audio/mpd-mpris/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix
index a261e6a785f1..8e399ee2bb5f 100644
--- a/pkgs/tools/audio/mpd-mpris/default.nix
+++ b/pkgs/tools/audio/mpd-mpris/default.nix
@@ -30,8 +30,7 @@ buildGoModule rec {
   subPackages = [ "cmd/${pname}" ];
 
   postInstall = ''
-    mkdir -p $out/lib/systemd/user
-    cp mpd-mpris.service $out/lib/systemd/user
+    install -Dm644 mpd-mpris.service $out/lib/systemd/user/mpd-mpris.service
   '';
 
   meta = with lib; {

From 47c85f68e08f665397843ee03a119c097aa49ea8 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 30 Aug 2023 10:00:08 +0300
Subject: [PATCH 5/5] mpd-mpris: Install also autostart .desktop file

---
 pkgs/tools/audio/mpd-mpris/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix
index 8e399ee2bb5f..f530ffc5d664 100644
--- a/pkgs/tools/audio/mpd-mpris/default.nix
+++ b/pkgs/tools/audio/mpd-mpris/default.nix
@@ -31,6 +31,7 @@ buildGoModule rec {
 
   postInstall = ''
     install -Dm644 mpd-mpris.service $out/lib/systemd/user/mpd-mpris.service
+    install -Dm644 mpd-mpris.desktop $out/etc/xdg/autostart/mpd-mpris.desktop
   '';
 
   meta = with lib; {