From 73359a3cbee0fb7e45fcdb7a13f3cb11a2a6cbef Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 14 Jan 2016 10:31:02 +0000 Subject: [PATCH] Actually use openjdk8 binary build for x86_64-darwin. --- pkgs/top-level/all-packages.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b80a00b03a0..f009f818e9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;