retroarchBare: use ffmpeg instead of ffmpeg_3 (#123514)
This commit is contained in:
parent
029d53dbf9
commit
da5310f82e
@ -1,5 +1,5 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, which, pkg-config, makeWrapper
|
{ lib, stdenv, fetchFromGitHub, which, pkg-config, makeWrapper
|
||||||
, ffmpeg_3, libGLU, libGL, freetype, libxml2, python3
|
, ffmpeg, libGLU, libGL, freetype, libxml2, python3
|
||||||
, libobjc, AppKit, Foundation
|
, libobjc, AppKit, Foundation
|
||||||
, alsaLib ? null
|
, alsaLib ? null
|
||||||
, libdrm ? null
|
, libdrm ? null
|
||||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||||||
nativeBuildInputs = [ pkg-config wayland ]
|
nativeBuildInputs = [ pkg-config wayland ]
|
||||||
++ optional withVulkan makeWrapper;
|
++ optional withVulkan makeWrapper;
|
||||||
|
|
||||||
buildInputs = [ ffmpeg_3 freetype libxml2 libGLU libGL python3 SDL2 which ]
|
buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ]
|
||||||
++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
|
++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
|
||||||
++ optional withVulkan vulkan-loader
|
++ optional withVulkan vulkan-loader
|
||||||
++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ]
|
++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ]
|
||||||
|
Loading…
Reference in New Issue
Block a user