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

Merge pull request #162231 from Stunkymonkey/oraclejdk8distro-appendToName

Browse Source
This commit is contained in:
Sandro 2022-03-01 12:54:58 +01:00 committed by GitHub
commit 9f9ca94494
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 { };