diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 3a169de590bba..189154da8c4ec 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, cmake, boost, ffmpeg_4, darwin, zlib }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake +, ffmpeg_6 +, darwin +, zlib +}: stdenv.mkDerivation rec { pname = "chromaprint"; @@ -9,10 +17,26 @@ stdenv.mkDerivation rec { sha256 = "sha256-oarY+juLGLeNN1Wzdn+v+au2ckLgG0eOyaZOGQ8zXhw="; }; + patches = [ + # Use FFmpeg 5.x + # https://github.com/acoustid/chromaprint/pull/120 + (fetchpatch { + url = "https://github.com/acoustid/chromaprint/commit/8ccad6937177b1b92e40ab8f4447ea27bac009a7.patch"; + hash = "sha256-yO2iWmU9s2p0uJfwIdmk3jZ5HXBIQZ/NyOqG+Y5EHdg="; + excludes = [ "package/build.sh" ]; + }) + # ffmpeg5 fix for issue #122 + # https://github.com/acoustid/chromaprint/pull/125 + (fetchpatch { + url = "https://github.com/acoustid/chromaprint/commit/aa67c95b9e486884a6d3ee8b0c91207d8c2b0551.patch"; + hash = "sha256-dLY8FBzBqJehAofE924ayZK0HA/aKiuFhEFxL7dg6rY="; + }) + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ ffmpeg_4 ] ++ lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo zlib]); + buildInputs = [ ffmpeg_6 ] ++ lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics CoreVideo zlib ]); cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ];