MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

oraclejdk*: remove appendToName to have a consistent package name for repology

Browse source
This commit is contained in:
Felix Buehler 2022-02-28 15:23:07 +01:00
parent 9d821edfd1
commit b862d19b09
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View file

@ -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 =

7
pkgs/top-level/all-packages.nix
View file

@ -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 { };