about summary refs log tree commit diff
path: root/pkgs/development/compilers/oraclejdk
diff options
context:
space:
mode:
authortaku0 <mxxouy6x3m_github@tatapa.org>2017-11-12 15:02:35 +0900
committertaku0 <mxxouy6x3m_github@tatapa.org>2017-11-12 15:02:35 +0900
commit194fed059dea8f375944c5282b88f2e5b8f709d0 (patch)
tree01f8e24d6cacd5aedb26bc6b48cf06748463095d /pkgs/development/compilers/oraclejdk
parent65424eac661007073cc3f040651bdf795f150562 (diff)
oraclejdk: remove JCE option
The unlimited JCE is bundled by default with Oracle JDK 9.
http://www.oracle.com/technetwork/java/javase/terms/readme/jdk9-readme-3852447.html
Diffstat (limited to 'pkgs/development/compilers/oraclejdk')
-rw-r--r--pkgs/development/compilers/oraclejdk/jdk9-linux.nix19
1 files changed, 1 insertions, 18 deletions
diff --git a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix
index fbda96e142584..f14780661d749 100644
--- a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix
@@ -7,7 +7,6 @@
 , xorg ? null
 , packageType ? "JDK" # JDK, JRE, or ServerJRE
 , pluginSupport ? true
-, installjce ? false
 , glib
 , libxml2
 , ffmpeg_2
@@ -34,16 +33,6 @@ let
 
   downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads;
 
-  jce =
-    if installjce then
-      requireFile {
-        name = "jce_policy-8.zip";
-        url = "${downloadUrlBase}/jce8-download-2133166.html";
-        sha256 = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
-      }
-    else
-      "";
-
   rSubPaths = [
     "lib/jli"
     "lib/server"
@@ -79,8 +68,7 @@ let result = stdenv.mkDerivation rec {
       }
     else abort "unknown package Type ${packageType}";
 
-  nativeBuildInputs = [ file ]
-    ++ stdenv.lib.optional installjce unzip;
+  nativeBuildInputs = [ file ];
 
   buildInputs = [ makeWrapper ];
 
@@ -108,11 +96,6 @@ let result = stdenv.mkDerivation rec {
       fi
     done
 
-    if test -n "${jce}"; then
-      unzip ${jce}
-      cp -v UnlimitedJCEPolicy*/*.jar $out/lib/security
-    fi
-
     if test -z "$pluginSupport"; then
       rm -f $out/bin/javaws
     fi