From 194fed059dea8f375944c5282b88f2e5b8f709d0 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 12 Nov 2017 15:02:35 +0900 Subject: [PATCH] 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 --- .../compilers/oraclejdk/jdk9-linux.nix | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix index fbda96e1425..f14780661d7 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