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

oraclejdk: Update to 7u65

Browse Source
This commit is contained in:
Eelco Dolstra 2014-07-16 17:52:46 +02:00
parent 29c8fdc941
commit 396a55ac18
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/jdk/jdk-linux-base.nix
View File

@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
sha256 = sha256_i686; sha256 = sha256_i686;
} }
else if stdenv.system == "x86_64-linux" then else if stdenv.system == "x86_64-linux" then
requireFile { requireFile {
name = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz"; name = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz";
url = downloadUrl; url = downloadUrl;
@ -85,7 +84,7 @@ stdenv.mkDerivation rec {
# See: https://github.com/NixOS/patchelf/issues/10 # See: https://github.com/NixOS/patchelf/issues/10
dontStrip = 1; dontStrip = 1;
installPhase = '' installPhase = ''
cd .. cd ..
@ -140,7 +139,7 @@ stdenv.mkDerivation rec {
rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/server rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/server
rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/xawt rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/xawt
rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture} 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 \
-exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
@ -172,4 +171,3 @@ stdenv.mkDerivation rec {
meta.license = "unfree"; meta.license = "unfree";
} }

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

@ -1,9 +1,9 @@
import ./jdk-linux-base.nix { import ./jdk-linux-base.nix {
productVersion = "7"; productVersion = "7";
patchVersion = "60"; patchVersion = "65";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
sha256_i686 = "d736fb4fd7c8ef50b76411daa640c6feeb48a5c275d29a90ffeb916a78d47a48"; sha256_i686 = "e3032c561deb237c033b485a358cc429ec83b621303bc6b31768855778a9eaa0";
sha256_x86_64 = "c7232b717573b057dbe828d937ee406b7a75fbc6aba7f1de98a049cbd42c6ae8"; sha256_x86_64 = "33fac9630ca8c2d374247abc5c010ac8d2875a3384968aa3e74448361808e4b7";
jceName = "UnlimitedJCEPolicyJDK7.zip"; jceName = "UnlimitedJCEPolicyJDK7.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";