about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorBrian McKenna <brian@brianmckenna.org>2015-09-27 20:27:46 +1000
committerBrian McKenna <brian@brianmckenna.org>2015-09-27 20:28:49 +1000
commit2db64534f187e6a9b9a8539a3eb975e826c4112e (patch)
tree66fb78ba8b7f7da39cef948d3aa804263b90ae7e /pkgs/development/compilers
parent4a8e06f1f06fa0653793f038f5e2f53498ff7de5 (diff)
downloadnixlib-2db64534f187e6a9b9a8539a3eb975e826c4112e.tar
nixlib-2db64534f187e6a9b9a8539a3eb975e826c4112e.tar.gz
nixlib-2db64534f187e6a9b9a8539a3eb975e826c4112e.tar.bz2
nixlib-2db64534f187e6a9b9a8539a3eb975e826c4112e.tar.lz
nixlib-2db64534f187e6a9b9a8539a3eb975e826c4112e.tar.xz
nixlib-2db64534f187e6a9b9a8539a3eb975e826c4112e.tar.zst
nixlib-2db64534f187e6a9b9a8539a3eb975e826c4112e.zip
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.
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/oraclejdk/jdk-linux-base.nix2
1 files changed, 1 insertions, 1 deletions
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