diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ad86c2b1db6..5180004b9172 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14729,6 +14729,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"; diff --git a/pkgs/by-name/mp/mpdscribble/package.nix b/pkgs/by-name/mp/mpdscribble/package.nix index af9d85695815..1ec0d24c72d7 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 = '' @@ -52,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"; };