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

openjdk: Update to 7u60-b30

Browse Source
This commit is contained in:
Eelco Dolstra 2014-07-08 17:43:12 +02:00
parent c4877df388
commit 639f117ec4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,9 +15,9 @@ let
else else
throw "openjdk requires i686-linux or x86_64 linux"; 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. # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
paxflags = if stdenv.isi686 then "msp" else "m"; paxflags = if stdenv.isi686 then "msp" else "m";
@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
name = "openjdk-7u${update}b${build}"; name = "openjdk-7u${update}b${build}";
src = fetchurl { src = fetchurl {
url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip; url = "http://tarballs.nixos.org/openjdk-7u${update}-b${build}.tar.xz";
sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00"; sha256 = "08rp3bbbzk0p6226qayr1vmahhp41phm5g56dlb7d2hfp2cfpd81";
}; };
outputs = [ "out" "jre" ]; outputs = [ "out" "jre" ];
@ -51,10 +51,10 @@ stdenv.mkDerivation rec {
postUnpack = '' postUnpack = ''
sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \ sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \
-e "s@/bin/ls@${coreutils}/bin/ls@" \ -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@" \ 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} tar xf ${cupsSrc}
cupsDir=$(echo $(pwd)/cups-*) cupsDir=$(echo $(pwd)/cups-*)