public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Oraclejdk7: Fix hash and extracted path for jce_policy.zip. Add extra rpath.

Browse Source
This commit is contained in:
Rob Vermaas 2013-12-30 12:39:19 +01:00
parent 950b785993
commit 96a51da082
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/jdk/jdk7-linux.nix
View File

@ -29,10 +29,10 @@ let
requireFile { requireFile {
name = "UnlimitedJCEPolicyJDK7.zip"; name = "UnlimitedJCEPolicyJDK7.zip";
url = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; url = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
sha256 = "0qljzfxbikm8br5k7rkamibp1vkyjrf6blbxpx6hn4k46f62bhnh"; sha256 = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";
} }
else else
null; "";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -93,12 +93,13 @@ stdenv.mkDerivation {
jrePath=$out/jre jrePath=$out/jre
fi fi
if test -n "$jce"; then if test -n "${jce}"; then
unzip $jce unzip ${jce}
cp -v jce/*.jar $jrePath/lib/security cp -v UnlimitedJCEPolicy/*.jar $jrePath/lib/security
fi fi
rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli
rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}
# set all the dynamic linkers # set all the dynamic linkers
find $out -type f -perm +100 \ find $out -type f -perm +100 \