Unverified Commit 342e8db9 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

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

libretro.ppssspp: use bundled ffmpeg
parents 38a3b50f 526b8f68

pkgs/applications/emulators/retroarch/cores.nix

+4 −3
Original line number Diff line number Diff line
@@ -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"