philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

oracle jdk/jre: use requireFile instead of fetchurl (merge #537)

Browse source 
The user has to accept the EULA nowadays on the oracle website.
This commit is contained in:
Gergely Risko 2013-05-16 10:34:35 +02:00 committed by Vladimír Čunát
parent 07b26ce493
commit 51c69ea60e
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/compilers/jdk/jdk6-linux.nix
View file

@ -1,6 +1,6 @@
{ swingSupport ? true
, stdenv
, fetchurl
, requireFile
, unzip
, makeWrapper
, xlibs ? null
@ -32,13 +32,15 @@ stdenv.mkDerivation {
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-i586.bin;
requireFile {
name = "jdk-6u45-linux-i586.bin";
url = http://www.oracle.com/technetwork/java/javase/downloads/jdk6downloads-1902814.html;
sha256 = "0mx3d2qlal5zyz1a7ld1yk2rs8pf9sjxs2jzasais3nq30jmlfym";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-x64.bin;
requireFile {
name = "jdk-6u45-linux-x64.bin";
url = http://www.oracle.com/technetwork/java/javase/downloads/jdk6downloads-1902814.html;
sha256 = "1s0j1pdr6y8c816d9i86rx4zp12nbhmas1rxksp0r53cn7m3ljbb";
}
else