diff options
| author | Artturi <Artturin@artturin.com> | 2021-08-07 00:16:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-07 00:16:44 +0300 |
| commit | a8deceff73b3633db1766b49fc662c023bf8d792 (patch) | |
| tree | b2e16b18523afbaf257b1de7486c827d5e902787 | |
| parent | Merge pull request #132514 from NixOS/backport-132508-to-release-21.05 (diff) | |
| parent | oraclejdk*: use latest ffmpeg (diff) | |
| download | nixpkgs-a8deceff73b3633db1766b49fc662c023bf8d792.tar.gz | |
Merge pull request #126582 from NixOS/backport-123513-to-release-21.05
[Backport release-21.05] oraclejdk*: use latest ffmpeg
| -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; |