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

treewide: use ffmpeg_3 explicitly if not wanted otherwise

Browse Source 
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
This commit is contained in:
Doron Behar
2020-06-12 11:55:31 -07:00
committed by Jon
parent 8e1dcea3d5
commit 01d4e2fe33
135 changed files with 279 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/retroarch/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper
, ffmpeg, libGLU, libGL, freetype, libxml2, python3
, ffmpeg_3, libGLU, libGL, freetype, libxml2, python3
, libobjc, AppKit, Foundation
, alsaLib ? null
, libdrm ? null
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wayland ]
++ optional withVulkan makeWrapper;
buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ]
buildInputs = [ ffmpeg_3 freetype libxml2 libGLU libGL python3 SDL2 which ]
++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
++ optional withVulkan vulkan-loader
++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ]