From 4e1b21d133821f5eddf299bcd3962a17a2771e78 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Sep 2015 20:18:38 +0200 Subject: [PATCH] Make the jdk/jre attributes work on Darwin --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5912643c94a..f17a202daa1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4155,8 +4155,8 @@ let jdk8 = openjdk8 // { outputs = [ "out" ]; }; jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (openjdk8.jre // { outputs = [ "jre" ]; }); - jdk = jdk8; - jre = jre8; + jdk = if stdenv.isDarwin then jdk7 else jdk8; + jre = if stdenv.isDarwin then jre7 else jre8; oraclejdk = pkgs.jdkdistro true false;