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

Merge pull request #79129 from volth/patch-380

Browse Source 
oraclejdk8: remove dead code
This commit is contained in:
Maximilian Bosch 2020-02-03 14:39:59 +01:00 committed by GitHub
commit f2653e0ae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@
, pluginSupport ? true , pluginSupport ? true
, installjce ? false , installjce ? false
, config , config
, licenseAccepted ? config.oraclejdk.accept_license or false
, glib , glib
, libxml2 , libxml2
, libav_0_8 , libav_0_8
@ -36,13 +35,6 @@
assert swingSupport -> xorg != null; 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 let
/** /**