Merge pull request #31552 from taku0/jdk9-remove-jce
oraclejdk: remove JCE option
This commit is contained in:
commit
1d17b481c6
1 changed files with 1 additions and 18 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue