diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 4d88f3b97729..8342c9fd3359 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -17,7 +17,8 @@ , installjdk ? true , pluginSupport ? true , installjce ? false -, licenseAccepted ? false +, config +, licenseAccepted ? config.oraclejdk.accept_license or false , glib , libxml2 , libav_0_8 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a847383e0c42..ec7012ac6916 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7197,14 +7197,12 @@ in (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { inherit installjdk pluginSupport; - licenseAccepted = config.oraclejdk.accept_license or false; }); oraclejdk8psu_distro = installjdk: pluginSupport: (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; - licenseAccepted = config.oraclejdk.accept_license or false; }); javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { };