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

openjdk: Update to 7u40b43

This commit is contained in:
Eelco Dolstra 2013-12-20 16:00:03 +01:00
parent 997778c820
commit 778539e871
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/openjdk/default.nix
View File

@ -39,9 +39,9 @@ let
else else
throw "openjdk requires i686-linux or x86_64 linux"; throw "openjdk requires i686-linux or x86_64 linux";
update = "6"; update = "40";
build = "24"; build = "43";
in in
@ -49,8 +49,8 @@ stdenv.mkDerivation rec {
name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}"; name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}";
src = fetchurl { src = fetchurl {
url = "http://www.java.net/download/openjdk/jdk7u6/promoted/b24/openjdk-7u6-fcs-src-b24-28_aug_2012.zip"; url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip;
sha256 = "1x1iq8ga0hqqh0bpcmydzzy19757hknn2yvgzib85p7b7dx0vfx9"; sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00";
}; };
# outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ]; # outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
@ -90,10 +90,7 @@ stdenv.mkDerivation rec {
openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
''; '';
patches = [ patches = [ ./cppflags-include-fix.patch ];
./cppflags-include-fix.patch
./no-crypto-restrictions.patch
];
makeFlags = [ makeFlags = [
"SORT=${coreutils}/bin/sort" "SORT=${coreutils}/bin/sort"
@ -108,6 +105,7 @@ stdenv.mkDerivation rec {
"DEVTOOLS_PATH=" "DEVTOOLS_PATH="
"UNIXCOMMAND_PATH=" "UNIXCOMMAND_PATH="
"BOOTDIR=${jdk}" "BOOTDIR=${jdk}"
"UNLIMITED_CRYPTO=1"
]; ];
configurePhase = '' configurePhase = ''

12
pkgs/development/compilers/openjdk/no-crypto-restrictions.patch
View File

@ -1,12 +0,0 @@
diff -Naur openjdk-orig/jdk/make/javax/crypto/Makefile openjdk/jdk/make/javax/crypto/Makefile
--- openjdk-orig/jdk/make/javax/crypto/Makefile 2011-06-27 13:18:45.000000000 -0400
+++ openjdk/jdk/make/javax/crypto/Makefile 2012-11-08 14:12:01.360718616 -0500
@@ -156,7 +156,7 @@
#
ifdef OPENJDK
-all: build-jar install-jar build-policy install-limited
+all: build-jar install-jar build-policy install-unlimited
else # OPENJDK
ifeq ($(strip $(FILES_java)),)
all: