Actually use openjdk8 binary build for x86_64-darwin.

This commit is contained in:
Rob Vermaas 2016-01-14 10:31:02 +00:00
parent 3da892a18e
commit 73359a3cbe

View File

@ -4235,9 +4235,13 @@ let
bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
};
openjdk8 = callPackage ../development/compilers/openjdk/8.nix {
bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
};
openjdk8 =
if stdenv.isDarwin then
callPackage ../development/compilers/openjdk-darwin/8.nix { }
else
callPackage ../development/compilers/openjdk/8.nix {
bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
};
openjdk = if stdenv.isDarwin then openjdk7 else openjdk8;