diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-03-16 11:11:31 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-03-16 11:11:31 +0100 |
| commit | 0f9354bfee9a3db6cba03008afe2f54e95c72e2a (patch) | |
| tree | 69e86f5824d000ff070b87c0543212d536bef5e8 /pkgs/applications/emulators/retroarch/cores.nix | |
| parent | 986e6010b9d94dde90559b0297115680c130fa81 (diff) | |
| parent | f8264a5b1e7832d93d8a22816f5133ff891724b6 (diff) | |
Merge #218309: ffmpeg: ffmpeg_4 → ffmpeg_5
...into staging
Diffstat (limited to 'pkgs/applications/emulators/retroarch/cores.nix')
| -rw-r--r-- | pkgs/applications/emulators/retroarch/cores.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 5aa4ff77fd8af..e38fe646c4c3d 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -7,6 +7,7 @@ , curl , fetchFromGitHub , ffmpeg +, ffmpeg_4 , fluidsynth , gettext , hexdump @@ -755,7 +756,7 @@ in ppsspp = mkLibretroCore { core = "ppsspp"; extraNativeBuildInputs = [ cmake pkg-config python3 ]; - extraBuildInputs = [ libGLU libGL libzip ffmpeg snappy xorg.libX11 ]; + extraBuildInputs = [ libGLU libGL libzip ffmpeg_4 snappy xorg.libX11 ]; makefile = "Makefile"; cmakeFlags = [ "-DLIBRETRO=ON" |