public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oraclejdk8: remove dependency on libav (#111528)

Browse Source
This commit is contained in:
Louis Bettens 2021-02-01 15:56:59 +01:00 committed by GitHub
parent e5749dceff
commit 5cbe469c62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@ -18,7 +18,6 @@
, config , config
, glib , glib
, libxml2 , libxml2
, libav_0_8
, ffmpeg_3 , ffmpeg_3
, libxslt , libxslt
, libGL , libGL
@ -171,8 +170,8 @@ let result = stdenv.mkDerivation rec {
* libXt is only needed on amd64 * libXt is only needed on amd64
*/ */
libraries = libraries =
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ [stdenv.cc.libc glib libxml2 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 []); 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; rpath = lib.strings.makeLibraryPath libraries;