JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #48649 from jerith666/jdk10-arm-oracle-retire

Browse Source 
jdk10: remove special handling for arm
This commit is contained in:
Jörg Thalheim 2018-10-18 08:53:55 +01:00 committed by GitHub
commit 11b097c7a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -6970,14 +6970,12 @@ with pkgs;
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
jdk10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; }; jdk10 = openjdk10 // { outputs = [ "out" ]; };
jre10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}" jre10 = lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
(openjdk10.jre // { outputs = [ "jre" ]; })); (openjdk10.jre // { outputs = [ "jre" ]; }));
jre10_headless = jre10_headless =
if stdenv.isAarch32 || stdenv.isAarch64 then if stdenv.isDarwin then
oraclejre10
else if stdenv.isDarwin then
jre10 jre10
else else
lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless" lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless"