From 2db64534f187e6a9b9a8539a3eb975e826c4112e Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Sun, 27 Sep 2015 20:27:46 +1000
Subject: [PATCH] oraclejdk8: Fix installation of JCE

Oracle changed the path of the files.

Previous versions looked like:

    $ jar tf UnlimitedJCEPolicyJDK7.zip
    UnlimitedJCEPolicy/
    UnlimitedJCEPolicy/US_export_policy.jar
    UnlimitedJCEPolicy/local_policy.jar
    UnlimitedJCEPolicy/README.txt

The new version looks like:

    $ jar tf jce_policy-8.zip
    UnlimitedJCEPolicyJDK8/
    UnlimitedJCEPolicyJDK8/local_policy.jar
    UnlimitedJCEPolicyJDK8/README.txt
    UnlimitedJCEPolicyJDK8/US_export_policy.jar

A better solution is probably just to trim the directory off completely.
---
 pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index 4e431d334cb0..5d294d5c43de 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -133,7 +133,7 @@ let result = stdenv.mkDerivation rec {
 
     if test -n "${jce}"; then
       unzip ${jce}
-      cp -v UnlimitedJCEPolicy/*.jar $jrePath/lib/security
+      cp -v UnlimitedJCEPolicy*/*.jar $jrePath/lib/security
     fi
 
     rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli