diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2017-09-21 18:56:54 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2017-09-21 18:56:54 -0400 |
| commit | 65197a15b00c7990516ceb9eaaeb1d78993e5652 (patch) | |
| tree | fae9f57ee9ccb81de25236f8ea32ca87d235c353 /pkgs/development/compilers/zulu/default.nix | |
| parent | 62f8e255a49e485742096bf985cd81d3af9280e6 (diff) | |
| download | nixpkgs-65197a15b00c7990516ceb9eaaeb1d78993e5652.tar nixpkgs-65197a15b00c7990516ceb9eaaeb1d78993e5652.tar.gz nixpkgs-65197a15b00c7990516ceb9eaaeb1d78993e5652.tar.bz2 nixpkgs-65197a15b00c7990516ceb9eaaeb1d78993e5652.tar.lz nixpkgs-65197a15b00c7990516ceb9eaaeb1d78993e5652.tar.xz nixpkgs-65197a15b00c7990516ceb9eaaeb1d78993e5652.tar.zst nixpkgs-65197a15b00c7990516ceb9eaaeb1d78993e5652.zip | |
zulu: init 9.0.0.15
Diffstat (limited to 'pkgs/development/compilers/zulu/default.nix')
| -rw-r--r-- | pkgs/development/compilers/zulu/default.nix | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index f7638757ff7..92f1f0a111e 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath , zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib -, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg +, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg, zlib , swingSupport ? true }: let - version = "8.21.0.1"; - openjdk = "8.0.131"; + version = "9.0.0.15"; + openjdk = "9.0.0"; - sha256_linux = "0cr1wvk1ifdq69ia8sr6171yzciba8l5x7dszwa5g2v0vmmqq88p"; - sha256_darwin = "0xq9bdzbdq8wq48gj6j56bw30l2iafz6sy1wdhrf92n9bnz5qmw7"; + sha256_linux = "0s9vr135yhdnxqds4hfafyrlh33j6g78v6l1v0ap2y6yqgabh9qi"; + sha256_darwin = "104w1msrwijf8dv3n65hjinp7i47z6ygzjipdzqriqam2zljxn4b"; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; @@ -17,7 +17,7 @@ let 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 + gnome2.gtk cairo gdk_pixbuf atk zlib ] ++ (lib.optionals swingSupport (with xorg; [ xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc @@ -39,12 +39,9 @@ in stdenv.mkDerivation rec { mkdir -p $out cp -r ./* "$out/" - jrePath="$out/jre" - - rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/jli - rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/server - rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/xawt - rpath=$rpath''${rpath:+:}$jrePath/lib/amd64 + rpath=$rpath''${rpath:+:}$out/lib/jli + rpath=$rpath''${rpath:+:}$out/lib/server + rpath=$rpath''${rpath:+:}$out/lib # set all the dynamic linkers find $out -type f -perm -0100 \ |