diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 84c8d7ce74bb..808b04d6687e 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, meson, ninja, pkg-config, @@ -201,15 +202,26 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.16"; + version = "0.23.17"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-0To+V+4xLjymGpRSpsyE/Une5uUpCEiAg+d041guPA0="; + sha256 = "sha256-1+eVLvwMp6mR38y39wV73rhPA998ip7clyyKcJ008z0="; }; + patches = [ + # Revert of https://github.com/MusicPlayerDaemon/MPD/commit/0aeda01ba6d22a8d9fc583faa67ffc6473869a43 + # We use a yajl fork that fixed this issue in the pkg-config manifest + (fetchpatch2 { + name = "revert-yajl-include-fix.patch"; + url = "https://github.com/MusicPlayerDaemon/MPD/commit/0aeda01ba6d22a8d9fc583faa67ffc6473869a43.diff"; + hash = "sha256-p/sYvWpr0GTw8gjt+W9FQysadOK/QOUp81ykTI50UYg="; + revert = true; + }) + ]; + buildInputs = [ glib