pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #309249 from thiagokokada/use-bundled-ffmpeg

libretro.ppssspp: use bundled ffmpeg

authored by Thiago Kenji Okada and committed by GitHub 342e8db9 38a3b50f

+4 -3
unified split
+4 -3
pkgs/applications/emulators/retroarch/cores.nix
··· 9 , fetchFromGitHub 10 , fetchpatch 11 , ffmpeg 12 - , ffmpeg_4 13 , fluidsynth 14 , fmt 15 , freetype ··· 890 ppsspp = mkLibretroCore { 891 core = "ppsspp"; 892 extraNativeBuildInputs = [ cmake pkg-config python3 ]; 893 - extraBuildInputs = [ libGLU libGL libzip ffmpeg_4 snappy xorg.libX11 ]; 894 makefile = "Makefile"; 895 cmakeFlags = [ 896 "-DLIBRETRO=ON" 897 - "-DUSE_SYSTEM_FFMPEG=ON" 898 "-DUSE_SYSTEM_SNAPPY=ON" 899 "-DUSE_SYSTEM_LIBZIP=ON" 900 "-DOpenGL_GL_PREFERENCE=GLVND"
··· 9 , fetchFromGitHub 10 , fetchpatch 11 , ffmpeg 12 , fluidsynth 13 , fmt 14 , freetype ··· 889 ppsspp = mkLibretroCore { 890 core = "ppsspp"; 891 extraNativeBuildInputs = [ cmake pkg-config python3 ]; 892 + extraBuildInputs = [ libGLU libGL libzip snappy xorg.libX11 ]; 893 makefile = "Makefile"; 894 cmakeFlags = [ 895 "-DLIBRETRO=ON" 896 + # USE_SYSTEM_FFMPEG=ON causes several glitches during video playback 897 + # See: https://github.com/NixOS/nixpkgs/issues/304616 898 + "-DUSE_SYSTEM_FFMPEG=OFF" 899 "-DUSE_SYSTEM_SNAPPY=ON" 900 "-DUSE_SYSTEM_LIBZIP=ON" 901 "-DOpenGL_GL_PREFERENCE=GLVND"