From 1a0098042d8475730b33055afcaaaa699bfa0bcb Mon Sep 17 00:00:00 2001
From: Matthew Glazar <strager.nds@gmail.com>
Date: Sat, 20 Apr 2019 21:13:45 -0700
Subject: [PATCH] oraclejdk: use working mirror for download

http://download.oracle.com/otn-pub/ was recently renamed to
http://download.oracle.com/otn/ and now requires authentication with an
Oracle account. http://download.oracle.com/otn-pub/ links don't work
anymore, so installing oraclejdk fails.

Switch to http://javadl.oracle.com/webapps/download/GetFile/, which does
not require authentication. This fixes installing oraclejdk.

Note: The URL for JCE is still broken; this commit only fixes the URL
for the JDK.
---
 pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index 8342c9fd335..ea6b9d2a9fe 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -89,8 +89,9 @@ let result = stdenv.mkDerivation rec {
       armv7l-linux  = "linux-arm32-vfp-hflt";
       aarch64-linux = "linux-arm64-vfp-hflt";
     }.${stdenv.hostPlatform.system};
+    javadlPlatformName = "linux-i586";
   in fetchurl {
-   url = "http://download.oracle.com/otn-pub/java/jdk/${productVersion}u${patchVersion}-b${buildVersion}/${releaseToken}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
+   url = "http://javadl.oracle.com/webapps/download/GetFile/1.${productVersion}.0_${patchVersion}-b${buildVersion}/${releaseToken}/${javadlPlatformName}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
    curlOpts = "-b oraclelicense=a";
    sha256 = sha256.${stdenv.hostPlatform.system};
   };