diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-25 16:43:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 16:43:58 +0000 |
| commit | 0fadb81af44fe7f43581a276d2ca863bdb64dd67 (patch) | |
| tree | a2d5e96b79909248c016cb363c10a37a10bef23f | |
| parent | a31d98f3120e0f676303b7fc3e84424e6b325290 (diff) | |
| parent | b5c200bc25a3c4eec0ce413ed08e5f819d759050 (diff) | |
| download | nixpkgs-0fadb81af44fe7f43581a276d2ca863bdb64dd67.tar nixpkgs-0fadb81af44fe7f43581a276d2ca863bdb64dd67.tar.gz nixpkgs-0fadb81af44fe7f43581a276d2ca863bdb64dd67.tar.bz2 nixpkgs-0fadb81af44fe7f43581a276d2ca863bdb64dd67.tar.lz nixpkgs-0fadb81af44fe7f43581a276d2ca863bdb64dd67.tar.xz nixpkgs-0fadb81af44fe7f43581a276d2ca863bdb64dd67.tar.zst nixpkgs-0fadb81af44fe7f43581a276d2ca863bdb64dd67.zip | |
Merge pull request #35510 from volth/jdk-on-aarch64
jdk: use oraclejdk on aarch64
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a9b609ddcc..4da70b518b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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" ]; })); |