jdk10: remove special handling for arm
neither oraclejdk nor openjdk is supported on arm, so this is needless complexity
This commit is contained in:
parent
45a419ab5a
commit
f1195b912b
@ -6964,14 +6964,12 @@ with pkgs;
|
||||
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
|
||||
((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
|
||||
|
||||
jdk10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; };
|
||||
jre10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
|
||||
jdk10 = openjdk10 // { outputs = [ "out" ]; };
|
||||
jre10 = lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
|
||||
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
|
||||
(openjdk10.jre // { outputs = [ "jre" ]; }));
|
||||
jre10_headless =
|
||||
if stdenv.isAarch32 || stdenv.isAarch64 then
|
||||
oraclejre10
|
||||
else if stdenv.isDarwin then
|
||||
if stdenv.isDarwin then
|
||||
jre10
|
||||
else
|
||||
lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless"
|
||||
|
Loading…
Reference in New Issue
Block a user