swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-30 17:10:18 +02:00
Code Issues 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
parent 77e90ef365 f1195b912b
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" ]; }
((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"