ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-12 03:56:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31552 from taku0/jdk9-remove-jce

Browse Source 
oraclejdk: remove JCE option
This commit is contained in:
Tim Steinbach 2018-01-17 13:56:40 +00:00 committed by GitHub
commit 1d17b481c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/compilers/oraclejdk/jdk9-linux.nix
View File

@ -7,7 +7,6 @@
, xorg ? null , xorg ? null
, packageType ? "JDK" # JDK, JRE, or ServerJRE , packageType ? "JDK" # JDK, JRE, or ServerJRE
, pluginSupport ? true , pluginSupport ? true
, installjce ? false
, glib , glib
, libxml2 , libxml2
, ffmpeg_2 , ffmpeg_2
@ -34,16 +33,6 @@ let
downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; 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 = [ rSubPaths = [
"lib/jli" "lib/jli"
"lib/server" "lib/server"
@ -79,8 +68,7 @@ let result = stdenv.mkDerivation rec {
} }
else abort "unknown package Type ${packageType}"; else abort "unknown package Type ${packageType}";
nativeBuildInputs = [ file ] nativeBuildInputs = [ file ];
++ stdenv.lib.optional installjce unzip;
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
@ -108,11 +96,6 @@ let result = stdenv.mkDerivation rec {
fi fi
done done
if test -n "${jce}"; then
unzip ${jce}
cp -v UnlimitedJCEPolicy*/*.jar $out/lib/security
fi
if test -z "$pluginSupport"; then if test -z "$pluginSupport"; then
rm -f $out/bin/javaws rm -f $out/bin/javaws
fi fi