diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-16 23:53:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-16 23:53:25 +0200 |
| commit | 50236d44c0041bd86ee2551285faa22771e8683c (patch) | |
| tree | a095c547f8613edb1374908926edbddaa2a9c642 | |
| parent | microcodeIntel: 20210216 -> 20210608 (diff) | |
| parent | Update pkgs/misc/emulators/ppsspp/default.nix (diff) | |
| download | nixpkgs-50236d44c0041bd86ee2551285faa22771e8683c.tar.gz | |
Merge pull request #127122 from NixOS/backport-123843-to-release-21.05
| -rw-r--r-- | pkgs/misc/emulators/ppsspp/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 4f5b4f7d69b6..124b8cb8e690 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,15 @@ mkDerivation rec { sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU="; }; + patches = [ + # fix compability with ffmpeg 4.4, remove on next release after 1.11 + (fetchpatch { + name = "fix_ffmpeg_4.4.patch"; + 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 |