From 526b8f683b2c8b33fbc7845ef65ede8dd93149b2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 5 May 2024 12:05:42 +0100 Subject: [PATCH] libretro.ppssspp: use bundled ffmpeg --- pkgs/applications/emulators/retroarch/cores.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index b42966f5a10ca..d4fb8a4c3afb6 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -9,7 +9,6 @@ , fetchFromGitHub , fetchpatch , ffmpeg -, ffmpeg_4 , fluidsynth , fmt , freetype @@ -890,11 +889,13 @@ in ppsspp = mkLibretroCore { core = "ppsspp"; extraNativeBuildInputs = [ cmake pkg-config python3 ]; - extraBuildInputs = [ libGLU libGL libzip ffmpeg_4 snappy xorg.libX11 ]; + extraBuildInputs = [ libGLU libGL libzip snappy xorg.libX11 ]; makefile = "Makefile"; cmakeFlags = [ "-DLIBRETRO=ON" - "-DUSE_SYSTEM_FFMPEG=ON" + # USE_SYSTEM_FFMPEG=ON causes several glitches during video playback + # See: https://github.com/NixOS/nixpkgs/issues/304616 + "-DUSE_SYSTEM_FFMPEG=OFF" "-DUSE_SYSTEM_SNAPPY=ON" "-DUSE_SYSTEM_LIBZIP=ON" "-DOpenGL_GL_PREFERENCE=GLVND"