alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

icedtea7: Fix patch

Browse source
This commit is contained in:
Ricardo M. Correia 2014-09-01 15:12:45 +02:00
parent fbd6f4d9b3
commit 4dca8beea0
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/compilers/icedtea/cppflags-include-fix.patch
View file

@ -1,7 +1,8 @@
diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk diff --git 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 index c6ab06d..23a14da 100644
+++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-01-22 11:56:22.315418708 -0500 --- openjdk-orig/jdk/make/sun/awt/mawt.gmk
@@ -234,12 +234,6 @@ +++ openjdk/jdk/make/sun/awt/mawt.gmk
@@ -270,12 +270,6 @@ LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
endif # !HEADLESS endif # !HEADLESS
endif # PLATFORM 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)) - $(wildcard /usr/include/X11/extensions))
-endif -endif
- -
ifeq ($(PLATFORM), macosx)) ifeq ($(PLATFORM), macosx)
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
-I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include

2
pkgs/development/compilers/icedtea/default.nix
View file

@ -24,7 +24,7 @@ let
defSrc = name: defSrc = name:
with (builtins.getAttr name srcInfo.bundles); fetchurl { with (builtins.getAttr name srcInfo.bundles); fetchurl {
inherit url sha256; inherit url sha256;
name = "${pkgName}-${name}-${baseNameOf url}"; name = "${pkgName}-${baseNameOf url}";
}; };
bundleNames = builtins.attrNames srcInfo.bundles; bundleNames = builtins.attrNames srcInfo.bundles;