diff options
| -rw-r--r-- | pkgs/development/compilers/openjdk/bootstrap.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 884e8eb886ed..3943396f241e 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6ecddc7f13c..ea4b1496f3cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |