Author: shlevy
Date: Thu Aug 11 01:12:46 2011
New Revision: 28477
URL: https://svn.nixos.org/websvn/nix/?rev=28477&sc=1
Log:
openjdk: Download source drops ahead of time instead of allowing downloads
during build
The openjdk build docs say that the releases should contain these drops, but
they don't for some reason.
Modified:
nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix Thu Aug
11 01:12:37 2011 (r28476)
+++ nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix Thu Aug
11 01:12:46 2011 (r28477)
@@ -29,6 +29,20 @@
sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
};
+ jaxws_src_name = "jdk7-jaxws2_2_4-b03-2011_05_27.zip";
+
+ jaxws_src = fetchurl {
+ url =
"http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/${jaxws_src_name}";;
+ sha256 = "1mpzgr9lnbf2p3x45npcniy47kbzi3hyqqbd4w3j63sxnxcp5bh5";
+ };
+
+ jaxp_src_name = "jaxp145_01.zip";
+
+ jaxp_src = fetchurl {
+ url = "http://download.java.net/jaxp/1.4.5/${jaxp_src_name}";;
+ sha256 = "1js8m1a6lcn95byplmjjs1lja1maisyl6lgfjy1jx3lqi1hlr4n5";
+ };
+
buildInputs = [
unzip
procps
@@ -47,6 +61,11 @@
];
postUnpack = ''
+ ensureDir drops
+ cp ${jaxp_src} drops/${jaxp_src_name}
+ cp ${jaxws_src} drops/${jaxws_src_name}
+ export DROPS_PATH=$(pwd)/drops
+
sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \
-e "s@/bin/ls@${coreutils}/bin/ls@" \
openjdk/hotspot/make/linux/makefiles/sa.make
@@ -73,7 +92,7 @@
"DEVTOOLS_PATH="
"UNIXCOMMAND_PATH="
"BOOTDIR=${jdk}"
- "ALLOW_DOWNLOADS=true"
+ "DROPS_DIR=$(DROPS_PATH)"
];
configurePhase = ''
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
