tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #35510 from volth/jdk-on-aarch64

jdk: use oraclejdk on aarch64

authored by Jörg Thalheim and committed by GitHub 0fadb81a a31d98f3

+14 -6
unified split
+14 -6
pkgs/top-level/all-packages.nix
··· 6304 6304 (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } 6305 6305 (openjdk7.jre // { outputs = [ "jre" ]; })); 6306 6306 6307 - jdk8 = if stdenv.isArm then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; 6308 - jre8 = if stdenv.isArm then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" 6307 + jdk8 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; 6308 + jre8 = if stdenv.isArm || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" 6309 6309 (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } 6310 6310 (openjdk8.jre // { outputs = [ "jre" ]; })); 6311 6311 jre8_headless = 6312 - if stdenv.isDarwin then jre8 else 6312 + if stdenv.isArm || stdenv.isAarch64 then 6313 + oraclejre8 6314 + else if stdenv.isDarwin then 6315 + jre8 6316 + else 6313 6317 lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless" 6314 6318 (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } 6315 6319 ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); 6316 6320 6317 - jdk9 = openjdk9 // { outputs = [ "out" ]; }; 6318 - jre9 = lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" 6321 + jdk9 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; }; 6322 + jre9 = if stdenv.isArm || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" 6319 6323 (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } 6320 6324 (openjdk9.jre // { outputs = [ "jre" ]; })); 6321 6325 jre9_headless = 6322 - if stdenv.isDarwin then jre9 else 6326 + if stdenv.isArm || stdenv.isAarch64 then 6327 + oraclejre9 6328 + else if stdenv.isDarwin then 6329 + jre9 6330 + else 6323 6331 lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}-headless" 6324 6332 (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } 6325 6333 ((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));