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

openjdk10: add new bootstrap minimal binary packages

Browse Source 
JDK 10 can only be bootstrapped by version 9 or 10, but we want to
now get rid of version 9.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2018-03-29 20:32:44 -05:00
parent da9fba1a54
commit 0d04d01021
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/openjdk/bootstrap.nix
View File

@ -9,7 +9,12 @@ assert stdenv.hostPlatform.libc == "glibc";
let
# !!! These should be on nixos.org
src = if stdenv.hostPlatform.system == "x86_64-linux" then
(if version == "8" then
(if version == "10" then
fetchurl {
url = "https://inner-haven.net/~aseipp/nix/openjdk10-bootstrap-x86_64-linux.tar.xz";
sha256 = "08085fsxc1qhqiv3yi38w8lrg3vm7s0m2yvnwr1c92v019806yq2";
}
else if version == "8" then
fetchurl {
url = "https://www.dropbox.com/s/a0lsq2ig4uguky5/openjdk8-bootstrap-x86_64-linux.tar.xz?dl=1";
sha256 = "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks";
@ -21,7 +26,12 @@ let
}
else throw "No bootstrap for version")
else if stdenv.hostPlatform.system == "i686-linux" then
(if version == "8" then
(if version == "10" then
fetchurl {
url = "https://inner-haven.net/~aseipp/nix/openjdk10-bootstrap-i686-linux.tar.xz";
sha256 = "1blb9gyzp8gfyggxvggqgpcgfcyi00ndnnskipwgdm031qva94p7";
}
else if version == "8" then
fetchurl {
url = "https://www.dropbox.com/s/rneqjhlerijsw74/openjdk8-bootstrap-i686-linux.tar.xz?dl=1";
sha256 = "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9";

2
pkgs/top-level/all-packages.nix
View File

@ -6395,7 +6395,7 @@ with pkgs;
openjdk10 =
callPackage ../development/compilers/openjdk/10.nix {
bootjdk = openjdk9;
bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; };
inherit (gnome2) GConf gnome_vfs;
};