diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 008eb991a6ad..fb39c50da54a 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -15,9 +15,9 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "40"; + update = "60"; - build = "43"; + build = "30"; # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. paxflags = if stdenv.isi686 then "msp" else "m"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { name = "openjdk-7u${update}b${build}"; src = fetchurl { - url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip; - sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00"; + url = "http://tarballs.nixos.org/openjdk-7u${update}-b${build}.tar.xz"; + sha256 = "08rp3bbbzk0p6226qayr1vmahhp41phm5g56dlb7d2hfp2cfpd81"; }; outputs = [ "out" "jre" ]; @@ -51,10 +51,10 @@ stdenv.mkDerivation rec { postUnpack = '' sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \ -e "s@/bin/ls@${coreutils}/bin/ls@" \ - openjdk/hotspot/make/linux/makefiles/sa.make + openjdk*/hotspot/make/linux/makefiles/sa.make sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ - openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk + openjdk*/{jdk,corba}/make/common/shared/Defs-utils.gmk tar xf ${cupsSrc} cupsDir=$(echo $(pwd)/cups-*)