From babd906230da851b27fb66f18b90a2beac4c7ddd Mon Sep 17 00:00:00 2001 From: lunik1 Date: Fri, 21 May 2021 00:01:03 +0100 Subject: [PATCH 1/2] ppsspp: fix build against ffmpeg 4.4 --- pkgs/misc/emulators/ppsspp/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 4f5b4f7d69b6..cadbbd3810d9 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -1,5 +1,6 @@ { mkDerivation , fetchFromGitHub +, fetchpatch , SDL2 , cmake , ffmpeg @@ -26,6 +27,14 @@ mkDerivation rec { sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU="; }; + patches = [ + (fetchpatch { + name = "fix_ffmpeg_4.4.patch"; # to be removed with next release + url = "https://patch-diff.githubusercontent.com/raw/hrydgard/ppsspp/pull/14176.patch"; + sha256 = "sha256-ecDoOydaLfL6+eFpahcO1TnRl866mZZVHlr6Qrib1mo="; + }) + ]; + postPatch = '' substituteInPlace git-version.cmake --replace unknown ${src.rev} substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share From 89cbb28f64b3406164e61cd1fcd7504a89b6e8fd Mon Sep 17 00:00:00 2001 From: lunik1 <13547699+lunik1@users.noreply.github.com> Date: Fri, 21 May 2021 22:49:22 +0100 Subject: [PATCH 2/2] Update pkgs/misc/emulators/ppsspp/default.nix Co-authored-by: Sandro --- pkgs/misc/emulators/ppsspp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index cadbbd3810d9..124b8cb8e690 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -28,8 +28,9 @@ mkDerivation rec { }; patches = [ + # fix compability with ffmpeg 4.4, remove on next release after 1.11 (fetchpatch { - name = "fix_ffmpeg_4.4.patch"; # to be removed with next release + name = "fix_ffmpeg_4.4.patch"; url = "https://patch-diff.githubusercontent.com/raw/hrydgard/ppsspp/pull/14176.patch"; sha256 = "sha256-ecDoOydaLfL6+eFpahcO1TnRl866mZZVHlr6Qrib1mo="; })