From 4dca8beea06016a40d37b77953a071ab709a9e21 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 1 Sep 2014 15:12:45 +0200
Subject: [PATCH] icedtea7: Fix patch

---
 .../compilers/icedtea/cppflags-include-fix.patch      | 11 ++++++-----
 pkgs/development/compilers/icedtea/default.nix        |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch b/pkgs/development/compilers/icedtea/cppflags-include-fix.patch
index 8931c122538f..731a8d075488 100644
--- a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch
+++ b/pkgs/development/compilers/icedtea/cppflags-include-fix.patch
@@ -1,7 +1,8 @@
-diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
---- openjdk-orig/jdk/make/sun/awt/mawt.gmk	2012-08-28 19:13:16.000000000 -0400
-+++ openjdk/jdk/make/sun/awt/mawt.gmk	2013-01-22 11:56:22.315418708 -0500
-@@ -234,12 +234,6 @@
+diff --git openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
+index c6ab06d..23a14da 100644
+--- openjdk-orig/jdk/make/sun/awt/mawt.gmk
++++ openjdk/jdk/make/sun/awt/mawt.gmk
+@@ -270,12 +270,6 @@ LDFLAGS  += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
  endif # !HEADLESS
  endif # PLATFORM
  
@@ -11,6 +12,6 @@ diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.
 -                        $(wildcard /usr/include/X11/extensions))
 -endif
 -
- ifeq ($(PLATFORM), macosx))
+ ifeq ($(PLATFORM), macosx)
    CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
                -I$(OPENWIN_HOME)/include 
diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix
index 56c9e69c9a4a..15cf616cc30d 100644
--- a/pkgs/development/compilers/icedtea/default.nix
+++ b/pkgs/development/compilers/icedtea/default.nix
@@ -24,7 +24,7 @@ let
   defSrc = name:
     with (builtins.getAttr name srcInfo.bundles); fetchurl {
       inherit url sha256;
-      name = "${pkgName}-${name}-${baseNameOf url}";
+      name = "${pkgName}-${baseNameOf url}";
     };
 
   bundleNames = builtins.attrNames srcInfo.bundles;