diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-18 08:53:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-18 08:53:55 +0100 |
| commit | 11b097c7a416278a4d5e7d1e7fe6f9c39470e04d (patch) | |
| tree | b211c3ced8f2b6938228e1f24f29f7d1a51c4e27 /pkgs | |
| parent | 77e90ef365182a28c0e9ac99951f3ea946d17190 (diff) | |
| parent | f1195b912be8bd55c34ce6dfa268cb402d9abec7 (diff) | |
| download | nixlib-11b097c7a416278a4d5e7d1e7fe6f9c39470e04d.tar nixlib-11b097c7a416278a4d5e7d1e7fe6f9c39470e04d.tar.gz nixlib-11b097c7a416278a4d5e7d1e7fe6f9c39470e04d.tar.bz2 nixlib-11b097c7a416278a4d5e7d1e7fe6f9c39470e04d.tar.lz nixlib-11b097c7a416278a4d5e7d1e7fe6f9c39470e04d.tar.xz nixlib-11b097c7a416278a4d5e7d1e7fe6f9c39470e04d.tar.zst nixlib-11b097c7a416278a4d5e7d1e7fe6f9c39470e04d.zip | |
Merge pull request #48649 from jerith666/jdk10-arm-oracle-retire
jdk10: remove special handling for arm
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c8e3fd04f69..dfe6f5628d8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6970,14 +6970,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" |