diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-05-25 02:28:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-25 02:28:32 +0200 |
| commit | f76f2011a815116f1db01e2ef5dcbf36e94373a7 (patch) | |
| tree | b2821c7ad47af734bc715a352b4bd9656017e3c8 /pkgs | |
| parent | 3527938d4e42781ce0e44bb92d33e5728c4b1489 (diff) | |
| parent | 50cb5bc35cd6d158672e0bc37cf0157790035168 (diff) | |
Merge pull request #123513 from lourkeur/oraclejdk_ffmpeg
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 2cb8a459e644a..ca8f4106f3db1 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -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; |