diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-05-23 00:31:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-23 00:31:55 -0500 |
| commit | af6b71df3e737feb717a5943da4c69af6b005035 (patch) | |
| tree | 9fbb5db9cdd0d6282aa6491022bf13378d2d4ebf | |
| parent | c0bbecef876916bbe3cf454c6101a8bb33ab085e (diff) | |
| parent | 7ce5b8e78ac314176bf898d250677e59fdd30866 (diff) | |
| download | nixpkgs-af6b71df3e737feb717a5943da4c69af6b005035.tar nixpkgs-af6b71df3e737feb717a5943da4c69af6b005035.tar.gz nixpkgs-af6b71df3e737feb717a5943da4c69af6b005035.tar.bz2 nixpkgs-af6b71df3e737feb717a5943da4c69af6b005035.tar.lz nixpkgs-af6b71df3e737feb717a5943da4c69af6b005035.tar.xz nixpkgs-af6b71df3e737feb717a5943da4c69af6b005035.tar.zst nixpkgs-af6b71df3e737feb717a5943da4c69af6b005035.zip | |
Merge pull request #233494 from ncfavier/mpd
mpd: 0.23.12 -> 0.23.13
| -rw-r--r-- | pkgs/servers/mpd/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 2e5da9bacef..5077f09f6dd 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, fmt, buildPackages +{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, glib, systemd, boost, fmt, buildPackages # Darwin inputs , AudioToolbox, AudioUnit # Inputs @@ -116,13 +116,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.12"; + version = "0.23.13"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-BnEtSkZjUBK0flVttOrjkT4RCQh9F7+MDZGm2+MMrX8="; + sha256 = "sha256-OqSK4oo+Tx7zf7slHH/sRPCCUOBjyipsqDCPovw45Mo="; }; buildInputs = [ @@ -147,6 +147,14 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; + patches = [ + (fetchpatch { + name = "mpd-systemd-paths.patch"; + url = "https://github.com/MusicPlayerDaemon/MPD/commit/838af929a0ae07e238d30cd7afc96cd7311457ef.patch"; + hash = "sha256-dqMxoeyRwRuhrbDxXyw1EyqPwXxJt48MdkdTweL7M/k="; + }) + ]; + postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") '' substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ --replace kAudioObjectPropertyElement{Main,Master} \ |