diff options
| author | Louis Bettens <louis@bettens.info> | 2021-05-18 15:03:45 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-11 10:10:58 +0000 |
| commit | de24120898f71b9f6ce94e162f188143747dbf86 (patch) | |
| tree | 8ad30faa57361d6102b9d6305eca804154b6edeb | |
| parent | Merge pull request #126576 from mkg20001/x2go-backport (diff) | |
| download | nixpkgs-origin/backport-123513-to-release-21.05.tar.gz | |
oraclejdk*: use latest ffmpegorigin/backport-123513-to-release-21.05
(cherry picked from commit 50cb5bc35cd6d158672e0bc37cf0157790035168)
| -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 2cb8a459e644..ca8f4106f3db 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; |