diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-02-03 14:39:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 14:39:59 +0100 |
| commit | f2653e0ae271bc110a4cf842b7fc5e5126dce4f7 (patch) | |
| tree | 9228ded5a86644b757d5c822a678f2417c0b7486 /pkgs | |
| parent | 31bcf8d363b26db0061099e4df314d6769b77b8f (diff) | |
| parent | 470dbf8895f1c846678c305e9bef4c49b361ac99 (diff) | |
| download | nixlib-f2653e0ae271bc110a4cf842b7fc5e5126dce4f7.tar nixlib-f2653e0ae271bc110a4cf842b7fc5e5126dce4f7.tar.gz nixlib-f2653e0ae271bc110a4cf842b7fc5e5126dce4f7.tar.bz2 nixlib-f2653e0ae271bc110a4cf842b7fc5e5126dce4f7.tar.lz nixlib-f2653e0ae271bc110a4cf842b7fc5e5126dce4f7.tar.xz nixlib-f2653e0ae271bc110a4cf842b7fc5e5126dce4f7.tar.zst nixlib-f2653e0ae271bc110a4cf842b7fc5e5126dce4f7.zip | |
Merge pull request #79129 from volth/patch-380
oraclejdk8: remove dead code
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index bbf1efcf5238..092af49a9f8b 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -16,7 +16,6 @@ , pluginSupport ? true , installjce ? false , config -, licenseAccepted ? config.oraclejdk.accept_license or false , glib , libxml2 , libav_0_8 @@ -36,13 +35,6 @@ assert swingSupport -> xorg != null; -if !licenseAccepted then throw '' - You must accept the Oracle Binary Code License Agreement for Java SE at - https://www.oracle.com/technetwork/java/javase/terms/license/index.html - by setting nixpkgs config option 'oraclejdk.accept_license = true;' - '' -else assert licenseAccepted; - let /** |