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

Merge pull request #126582 from NixOS/backport-123513-to-release-21.05

Browse Source 
[Backport release-21.05] oraclejdk*: use latest ffmpeg
This commit is contained in:
Artturi 2021-08-07 00:16:44 +03:00 committed by GitHub
commit a8deceff73
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/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@ -18,7 +18,7 @@
, config , config
, glib , glib
, libxml2 , libxml2
, ffmpeg_3 , ffmpeg
, libxslt , libxslt
, libGL , libGL
, freetype , freetype
@ -168,7 +168,7 @@ let result = stdenv.mkDerivation rec {
* libXt is only needed on amd64 * libXt is only needed on amd64
*/ */
libraries = libraries =
[stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ [stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc]; lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc];
rpath = lib.strings.makeLibraryPath libraries; rpath = lib.strings.makeLibraryPath libraries;