jre8_headless: use plain jre8 on Darwin
This commit is contained in:
parent
b59b89d9e3
commit
f561eb158e
@ -4902,7 +4902,9 @@ in
|
|||||||
jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
|
jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
|
||||||
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
|
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
|
||||||
(openjdk8.jre // { outputs = [ "jre" ]; }));
|
(openjdk8.jre // { outputs = [ "jre" ]; }));
|
||||||
jre8_headless = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless"
|
jre8_headless =
|
||||||
|
if stdenv.isDarwin then jre8 else
|
||||||
|
lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless"
|
||||||
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
|
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
|
||||||
((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
|
((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user