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/development/compilers/oraclejdk/jdk-linux-base.nix
+2 -2
View File
@@ -19,7 +19,7 @@
, glib
, libxml2
, libav_0_8
, ffmpeg
, ffmpeg_3
, libxslt
, libGL
, freetype
@@ -171,7 +171,7 @@ let result = stdenv.mkDerivation rec {
* libXt is only needed on amd64
*/
libraries =
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
(if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
rpath = stdenv.lib.strings.makeLibraryPath libraries;