From 10ea6439961e0d1090e9d818451806221d502976 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Sun, 3 Dec 2023 15:51:31 -0300 Subject: [PATCH] mpd: fix build with ffmpeg 6.1 --- pkgs/servers/mpd/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 11ea7716c630..a6fd225e5c58 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 @@ -148,6 +148,15 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; + # FIXME: see if it's still necessary and remove on next release + patches = [ + (fetchpatch { + url = "https://github.com/MusicPlayerDaemon/MPD/commit/50c1e3738a672f933560247b5527d365d17b1c02.patch"; + hash = "sha256-99XL3Yb1f9yrD0p+Ssn1HfAHrVoO/ky6bp3e1n1+yvg="; + excludes = [ "NEWS" ]; + }) + ]; + postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0") '' substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ --replace kAudioObjectPropertyElement{Main,Master} \