From 4bf98cdf8cc1e4ac186790b20ddc3372d477bf16 Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Sun, 22 Mar 2026 02:53:23 +0100
Subject: [PATCH 1/3] mpdscribble: 0.24 -> 0.25

---
 pkgs/by-name/mp/mpdscribble/package.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/mp/mpdscribble/package.nix b/pkgs/by-name/mp/mpdscribble/package.nix
index af9d85695815..435784a35f5b 100644
--- a/pkgs/by-name/mp/mpdscribble/package.nix
+++ b/pkgs/by-name/mp/mpdscribble/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   pkg-config,
   meson,
   ninja,
@@ -15,20 +14,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mpdscribble";
-  version = "0.24";
+  version = "0.25";
 
   src = fetchurl {
     url = "https://www.musicpd.org/download/mpdscribble/${finalAttrs.version}/mpdscribble-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-9rTLp0izuH5wUnC0kjyOI+lMLgD+3VC+sUaNvi+yqOc=";
+    sha256 = "sha256-IPidlFv1F8TWi/d6d6NZ/bE4QqsSlejSHtp5vitbNc4=";
   };
 
-  # Fix build issue on darwin; to be removed after the next release
-  patches = [
-    (fetchpatch {
-      name = "remove-empty-static-lib.patch";
-      url = "https://github.com/MusicPlayerDaemon/mpdscribble/commit/0dbcea25c81f3fdc608f71ef71a9784679fee17f.patch";
-      sha256 = "sha256-3wLfQvbwx+OFrCl5vMV7Zps4e4iEYFhqPiVCo5hDqgw=";
-    })
+  mesonFlags = [
+    (lib.mesonOption "systemd_user_unit_dir" "etc/systemd/user")
+    (lib.mesonOption "systemd_system_unit_dir" "etc/systemd/system")
   ];
 
   postPatch = ''

From 695051d908f207252dced4010b406de53af4cf7b Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Sun, 22 Mar 2026 03:37:05 +0100
Subject: [PATCH 2/3] maintainers: add kybe236

---
 maintainers/maintainer-list.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 938339bf8f4b..16031fd999b3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14709,6 +14709,14 @@
     github = "kxxt";
     githubId = 18085551;
   };
+  kybe236 = {
+    name = "kybe236";
+    github = "kybe236";
+    githubId = 118068228;
+    email = "kybe@kybe.xyz";
+    matrix = "@kybe:kybe.xyz";
+    keys = [ { fingerprint = "4B20 67C3 BD6D 410F 13E5  36A3 43CE 4393 8A3C 7A8F"; } ];
+  };
   kyehn = {
     name = "kyehn";
     github = "kyehn";

From 9a8f9c1b04aec71cb0ea5e6dd4102e35258a7b84 Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Sun, 22 Mar 2026 03:44:03 +0100
Subject: [PATCH 3/3] mpdscribble: add kybe236 as co-maintainer

---
 pkgs/by-name/mp/mpdscribble/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mp/mpdscribble/package.nix b/pkgs/by-name/mp/mpdscribble/package.nix
index 435784a35f5b..1ec0d24c72d7 100644
--- a/pkgs/by-name/mp/mpdscribble/package.nix
+++ b/pkgs/by-name/mp/mpdscribble/package.nix
@@ -47,7 +47,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "MPD client which submits info about tracks being played to a scrobbler";
     homepage = "https://www.musicpd.org/clients/mpdscribble/";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.sohalt ];
+    maintainers = [
+      lib.maintainers.sohalt
+      lib.maintainers.kybe236
+    ];
     platforms = lib.platforms.unix;
     mainProgram = "mpdscribble";
   };