diff options
| author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2018-01-17 13:56:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 13:56:40 +0000 |
| commit | 1d17b481c6d8073e5c5d5d5c724df46e98f948f1 (patch) | |
| tree | d26c872ea1070b3987b389cb9e166bc400eac3c0 /pkgs/development/compilers/oraclejdk | |
| parent | 1504e6942019fe01b0776f492d7d391bd707f1d6 (diff) | |
| parent | 194fed059dea8f375944c5282b88f2e5b8f709d0 (diff) | |
| download | nixlib-1d17b481c6d8073e5c5d5d5c724df46e98f948f1.tar nixlib-1d17b481c6d8073e5c5d5d5c724df46e98f948f1.tar.gz nixlib-1d17b481c6d8073e5c5d5d5c724df46e98f948f1.tar.bz2 nixlib-1d17b481c6d8073e5c5d5d5c724df46e98f948f1.tar.lz nixlib-1d17b481c6d8073e5c5d5d5c724df46e98f948f1.tar.xz nixlib-1d17b481c6d8073e5c5d5d5c724df46e98f948f1.tar.zst nixlib-1d17b481c6d8073e5c5d5d5c724df46e98f948f1.zip | |
Merge pull request #31552 from taku0/jdk9-remove-jce
oraclejdk: remove JCE option
Diffstat (limited to 'pkgs/development/compilers/oraclejdk')
| -rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk9-linux.nix | 19 |
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 29d77a613b38..38d06ea82f5f 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 |