cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #123513 from lourkeur/oraclejdk_ffmpeg

Browse source
This commit is contained in:
Sandro 2021-05-25 02:28:32 +02:00 committed by GitHub
commit f76f2011a8
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
, glib
, libxml2
, ffmpeg_3
, ffmpeg
, libxslt
, libGL
, freetype
@ -168,7 +168,7 @@ let result = stdenv.mkDerivation rec {
* libXt is only needed on amd64
*/
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];
rpath = lib.strings.makeLibraryPath libraries;