diff options
| author | Louis Bettens <lourkeur@users.noreply.github.com> | 2021-02-01 15:56:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 15:56:59 +0100 |
| commit | 5cbe469c62a51ad56feb2d84b1867952cb63bf67 (patch) | |
| tree | 6126119b1138fb706b455a99f2aa0da678576ed4 | |
| parent | e5749dceff43813cf258f0c95462a70a296fd1f7 (diff) | |
oraclejdk8: remove dependency on libav (#111528)
| -rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index c44d7fc116fe..7a6cdf4d7052 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -18,7 +18,6 @@ , config , glib , libxml2 -, libav_0_8 , ffmpeg_3 , libxslt , libGL @@ -171,8 +170,8 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ - (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); + [stdenv.cc.libc glib libxml2 ffmpeg_3 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; |