oraclejdk: 8u77 -> 8u91, 8u92

This commit is contained in:
taku0
2016-04-20 23:35:49 +09:00
parent d99eaf005c
commit 713a069155
3 changed files with 8 additions and 12 deletions
@@ -119,12 +119,6 @@ let result = stdenv.mkDerivation rec {
done
fi
# construct the rpath
rpath=
for i in $libraries; do
rpath=$rpath''${rpath:+:}$i/lib:$i/lib64
done
if test -z "$installjdk"; then
jrePath=$out
else
@@ -176,6 +170,8 @@ let result = stdenv.mkDerivation rec {
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk 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 []);
rpath = stdenv.lib.strings.makeLibraryPath libraries;
passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package