oraclejdk*: remove appendToName to have a consistent package name for repology
This commit is contained in:
parent
9d821edfd1
commit
b862d19b09
@ -66,7 +66,7 @@ let
|
||||
in
|
||||
|
||||
let result = stdenv.mkDerivation rec {
|
||||
pname = if installjdk then "oraclejdk" else "oraclejre";
|
||||
pname = if installjdk then "oraclejdk" else "oraclejre" + lib.optionalString pluginSupport "-with-plugin";
|
||||
version = "${productVersion}u${patchVersion}";
|
||||
|
||||
src =
|
||||
|
@ -12674,10 +12674,9 @@ with pkgs;
|
||||
jdkdistro = oraclejdk8distro;
|
||||
|
||||
oraclejdk8distro = installjdk: pluginSupport:
|
||||
(if pluginSupport then appendToName "with-plugin" else x: x)
|
||||
(callPackage ../development/compilers/oraclejdk/jdk8-linux.nix {
|
||||
inherit installjdk pluginSupport;
|
||||
});
|
||||
(callPackage ../development/compilers/oraclejdk/jdk8-linux.nix {
|
||||
inherit installjdk pluginSupport;
|
||||
});
|
||||
|
||||
oraclejdk11 = callPackage ../development/compilers/oraclejdk/jdk11-linux.nix { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user