From e48f5bc19813e50fe8c9d4ecccd2ac033b2b7c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 20 May 2015 01:55:05 +0200
Subject: [PATCH] openjdk8: readd symlinks and remove useless makeflags

---
 pkgs/development/compilers/openjdk/openjdk8.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index 95248dac76a..63d42e6e3d6 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -50,13 +50,16 @@ let
   '';
   prePatch = ''
     # despite --with-override-jdk the build still searchs here
-    # GNU Patch bug, follow symlinks only follow the last symlink..
+    # GNU Patch bug, --follow-symlinks only follow the last dir part symlink
     mv "../jdk-${repover}" "jdk";
     mv "../hotspot-${repover}" "hotspot";
   '';
   postPatch = ''
     mv jdk "../jdk-${repover}";
     mv hotspot "../hotspot-${repover}";
+    # Patching is over, lets re-add the links
+    ln -s "../jdk-${repover}" "jdk"
+    ln -s "../hotspot-${repover}" "hotspot"
   '';
   patches = [
     ./fix-java-home-jdk8.patch
@@ -83,7 +86,7 @@ let
     "--with-milestone=fcs"
   ];
   NIX_LDFLAGS= "-lfontconfig";
-  buildFlags = "DEBUG_BINARIES=true all";
+  buildFlags = "all";
   installPhase = ''
     mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk