diff options
Diffstat (limited to 'pkgs/development/compilers/openjdk/default.nix')
| -rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index d7e42d38948..4d4a129d573 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -39,9 +39,9 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "6"; + update = "40"; - build = "24"; + build = "43"; in @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}"; src = fetchurl { - url = "http://www.java.net/download/openjdk/jdk7u6/promoted/b24/openjdk-7u6-fcs-src-b24-28_aug_2012.zip"; - sha256 = "1x1iq8ga0hqqh0bpcmydzzy19757hknn2yvgzib85p7b7dx0vfx9"; + url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip; + sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00"; }; -# outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ]; + # outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ]; buildInputs = [ unzip @@ -90,10 +90,7 @@ stdenv.mkDerivation rec { openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c ''; - patches = [ - ./cppflags-include-fix.patch - ./no-crypto-restrictions.patch - ]; + patches = [ ./cppflags-include-fix.patch ]; makeFlags = [ "SORT=${coreutils}/bin/sort" @@ -109,6 +106,7 @@ stdenv.mkDerivation rec { "UNIXCOMMAND_PATH=" "BOOTDIR=${jdk}" "STATIC_CXX=false" + "UNLIMITED_CRYPTO=1" ]; configurePhase = '' @@ -118,6 +116,14 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out + + # Remove some broken manpages. + rm -rf $out/share/man/ja* + + # Remove crap from the installation. + rm -rf $out/demo $out/sample + + # Generate certificates. pushd $out/${if ! jreOnly then "jre/" else ""}lib/security rm cacerts perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt |