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

oraclejdk8distro, oraclejdk8psu_distro: move defaults to package file

Browse Source
This commit is contained in:
Jan Malakhovski 2019-02-03 15:33:24 +00:00
parent 15c52af2fe
commit 3a7f3a1119
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@ -17,7 +17,8 @@
, installjdk ? true , installjdk ? true
, pluginSupport ? true , pluginSupport ? true
, installjce ? false , installjce ? false
, licenseAccepted ? false , config
, licenseAccepted ? config.oraclejdk.accept_license or false
, glib , glib
, libxml2 , libxml2
, libav_0_8 , libav_0_8

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

@ -7197,14 +7197,12 @@ in
(if pluginSupport then appendToName "with-plugin" else x: x) (if pluginSupport then appendToName "with-plugin" else x: x)
(callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix {
inherit installjdk pluginSupport; inherit installjdk pluginSupport;
licenseAccepted = config.oraclejdk.accept_license or false;
}); });
oraclejdk8psu_distro = installjdk: pluginSupport: oraclejdk8psu_distro = installjdk: pluginSupport:
(if pluginSupport then appendToName "with-plugin" else x: x) (if pluginSupport then appendToName "with-plugin" else x: x)
(callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix {
inherit installjdk pluginSupport; inherit installjdk pluginSupport;
licenseAccepted = config.oraclejdk.accept_license or false;
}); });
javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { };