about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2019-02-03 15:33:24 +0000
committerJan Malakhovski <oxij@oxij.org>2019-02-03 15:33:24 +0000
commit3a7f3a1119e795d8b9a9886e11bd15c6f2ea386b (patch)
treeb1d5150a8bfdbc99ac8936ab233e863ce6d0a15a /pkgs/development/compilers
parent15c52af2fe8c948b5cbba1717dc38c7ccbd1898e (diff)
downloadnixlib-3a7f3a1119e795d8b9a9886e11bd15c6f2ea386b.tar
nixlib-3a7f3a1119e795d8b9a9886e11bd15c6f2ea386b.tar.gz
nixlib-3a7f3a1119e795d8b9a9886e11bd15c6f2ea386b.tar.bz2
nixlib-3a7f3a1119e795d8b9a9886e11bd15c6f2ea386b.tar.lz
nixlib-3a7f3a1119e795d8b9a9886e11bd15c6f2ea386b.tar.xz
nixlib-3a7f3a1119e795d8b9a9886e11bd15c6f2ea386b.tar.zst
nixlib-3a7f3a1119e795d8b9a9886e11bd15c6f2ea386b.zip
oraclejdk8distro, oraclejdk8psu_distro: move defaults to package file
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/oraclejdk/jdk-linux-base.nix3
1 files changed, 2 insertions, 1 deletions
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