mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 22:51:22 +00:00
Merge pull request #35510 from volth/jdk-on-aarch64
jdk: use oraclejdk on aarch64
This commit is contained in:
commit
0fadb81af4
@ -6304,22 +6304,30 @@ with pkgs;
|
||||
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
|
||||
(openjdk7.jre // { outputs = [ "jre" ]; }));
|
||||
|
||||
jdk8 = if stdenv.isArm then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };
|
||||
jre8 = if stdenv.isArm then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
|
||||
jdk8 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };
|
||||
jre8 = if stdenv.isArm || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
|
||||
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
|
||||
(openjdk8.jre // { outputs = [ "jre" ]; }));
|
||||
jre8_headless =
|
||||
if stdenv.isDarwin then jre8 else
|
||||
if stdenv.isArm || stdenv.isAarch64 then
|
||||
oraclejre8
|
||||
else 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" ]; }));
|
||||
|
||||
jdk9 = openjdk9 // { outputs = [ "out" ]; };
|
||||
jre9 = lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}"
|
||||
jdk9 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; };
|
||||
jre9 = if stdenv.isArm || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}"
|
||||
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
|
||||
(openjdk9.jre // { outputs = [ "jre" ]; }));
|
||||
jre9_headless =
|
||||
if stdenv.isDarwin then jre9 else
|
||||
if stdenv.isArm || stdenv.isAarch64 then
|
||||
oraclejre9
|
||||
else if stdenv.isDarwin then
|
||||
jre9
|
||||
else
|
||||
lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}-headless"
|
||||
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
|
||||
((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
|
||||
|
Loading…
Reference in New Issue
Block a user