From c857d59d7c1b5998d3e22b26cc288d037fa91c08 Mon Sep 17 00:00:00 2001 From: Jack Wilsdon Date: Fri, 25 Oct 2024 18:52:20 +0100 Subject: [PATCH] scummvm: fix building with Freetype 2.13.3 --- pkgs/games/scummvm/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 1125c62c87d8..32e7524645c3 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nasm +{ lib, stdenv, fetchFromGitHub, fetchpatch, nasm , alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libtheora, libvorbis, libGLU, libGL, SDL2, zlib , Cocoa, AudioToolbox, Carbon, CoreMIDI, AudioUnit, cctools }: @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { hash = "sha256-8/q16MwHhbbmUxiwJOHkjNxrnBB4grMa7qw/n3KLvRc="; }; + patches = [ + # Fix building with Freetype 2.13.3. Remove after next release. + (fetchpatch { + url = "https://github.com/scummvm/scummvm/commit/65977961b20ba97b1213b5267da0cb1efb49063b.patch?full_index=1"; + hash = "sha256-e5dJd3gP8OAD3hEJlvOhMemsNErCKTn7avlprApFig0="; + }) + ]; + nativeBuildInputs = [ nasm ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [