zulu: 8.19.0.1 -> 8.21.0.1

This commit is contained in:
Franz Pletz 2017-07-11 23:04:13 +02:00
parent f91c591ea2
commit 7ef578f160
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4

View File

@ -1,17 +1,28 @@
{ stdenv, pkgs, fetchurl, unzip, makeWrapper, setJavaClassPath, swingSupport ? true }: { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib
with pkgs; , fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg
, swingSupport ? true }:
let let
version = "8.19.0.1"; version = "8.21.0.1";
openjdk = "8.0.112"; openjdk = "8.0.131";
sha256_linux = "1icb6in1197n44wk2cqnrxr7w0bd5abxxysfrhbg56jlb9nzmp4x"; sha256_linux = "0cr1wvk1ifdq69ia8sr6171yzciba8l5x7dszwa5g2v0vmmqq88p";
sha256_darwin = "0kxwh62a6kckc9l9jkgakf86lqkqazp3dwfwaxqc4cg5zczgbhmd"; sha256_darwin = "0xq9bdzbdq8wq48gj6j56bw30l2iafz6sy1wdhrf92n9bnz5qmw7";
platform = if stdenv.isDarwin then "macosx" else "linux"; platform = if stdenv.isDarwin then "macosx" else "linux";
hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux;
extension = if stdenv.isDarwin then "zip" else "tar.gz"; extension = if stdenv.isDarwin then "zip" else "tar.gz";
libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk_pixbuf atk
] ++ (lib.optionals swingSupport (with xorg; [
xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
xorg.libXt xorg.libXrender stdenv.cc.cc
]));
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
inherit version openjdk platform hash extension; inherit version openjdk platform hash extension;
@ -22,7 +33,7 @@ in stdenv.mkDerivation rec {
sha256 = hash; sha256 = hash;
}; };
buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin [ unzip ]; buildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin unzip;
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
@ -51,9 +62,6 @@ in stdenv.mkDerivation rec {
EOF EOF
''; '';
libraries = [ stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.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; rpath = stdenv.lib.strings.makeLibraryPath libraries;
passthru = { passthru = {
@ -64,8 +72,11 @@ in stdenv.mkDerivation rec {
homepage = https://www.azul.com/products/zulu/; homepage = https://www.azul.com/products/zulu/;
license = licenses.gpl2; license = licenses.gpl2;
description = "Certified builds of OpenJDK"; description = "Certified builds of OpenJDK";
longDescription = "Certified builds of OpenJDK that can be deployed across multiple operating systems, containers, hypervisors and Cloud platforms"; longDescription = ''
maintainers = with maintainers; [ nequissimus ]; Certified builds of OpenJDK that can be deployed across multiple
operating systems, containers, hypervisors and Cloud platforms.
'';
maintainers = with maintainers; [ nequissimus fpletz ];
platforms = [ "x86_64-linux" "x86_64-darwin" ]; platforms = [ "x86_64-linux" "x86_64-darwin" ];
}; };
} }