public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

retroarchBare: use ffmpeg instead of ffmpeg_3 (#123514)

Browse Source
This commit is contained in:
Robert Schütz 2021-05-19 21:57:35 +02:00 committed by GitHub
parent 029d53dbf9
commit da5310f82e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/emulators/retroarch/default.nix
View File

@ -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 ]