From f561eb158e8ee434258d091a2ecd00e13235e4e1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 8 Oct 2016 12:28:05 +0300 Subject: [PATCH] jre8_headless: use plain jre8 on Darwin --- pkgs/top-level/all-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 022de400d94..7bdb0b39c2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4902,9 +4902,11 @@ in jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk8.jre // { outputs = [ "jre" ]; })); - jre8_headless = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + jre8_headless = + if stdenv.isDarwin then jre8 else + lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless" + (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } + ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); jdk = if stdenv.isDarwin then jdk7 else jdk8; jre = if stdenv.isDarwin then jre7 else jre8;