From ceb097cd01fefadc1ae971bf999f493b712ced6d Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Mon, 14 May 2007 22:49:45 +0000 Subject: [PATCH] partial fix for linking problems svn path=/nixpkgs/trunk/; revision=8696 --- pkgs/applications/graphics/xara/default.nix | 2 ++ .../graphics/xara/gtk_cflags.patch | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/graphics/xara/gtk_cflags.patch diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index dc296c5b481a..495e1f930762 100644 --- a/pkgs/applications/graphics/xara/default.nix +++ b/pkgs/applications/graphics/xara/default.nix @@ -10,4 +10,6 @@ stdenv.mkDerivation { buildInputs = [automake autoconf gettext libtool cvs wxGTK gtk pkgconfig libxml2 zip libpng libjpeg]; configureFlags = "--with-wx-config --disable-svnversion --disable-international"; + + patches = [./gtk_cflags.patch]; } diff --git a/pkgs/applications/graphics/xara/gtk_cflags.patch b/pkgs/applications/graphics/xara/gtk_cflags.patch new file mode 100644 index 000000000000..842236073996 --- /dev/null +++ b/pkgs/applications/graphics/xara/gtk_cflags.patch @@ -0,0 +1,20 @@ +diff -rc XaraLX-0.7r1766/Makefile.in XaraLX-0.7r1766.new/Makefile.in +*** XaraLX-0.7r1766/Makefile.in 2007-01-31 13:43:04.000000000 +0100 +--- XaraLX-0.7r1766.new/Makefile.in 2007-05-15 00:19:36.000000000 +0200 +*************** +*** 256,262 **** + @DARWIN_LINK_TRUE@XaraLX_SOURCES = Kernel/*.o wxOil/*.o tools/*.o wxXtra/*.o + @DARWIN_LINK_FALSE@XaraLX_LDSOURCE = -Wl,--start-group $(XaraLX_SOURCES) -Wl,--end-group + @DARWIN_LINK_TRUE@XaraLX_LDSOURCE = $(XaraLX_SOURCES) +! XaraLX_LDFLAGS = --debug -L$(srcdir)/$(CDRAW_LIB_DIR) $(WX_LIBS) $(LIBS) $(LIBXML2_LIBS) -lCDraw + UNZIP = unzip + ACLOCAL_AMFLAGS = -I m4 + all: all-recursive +--- 256,262 ---- + @DARWIN_LINK_TRUE@XaraLX_SOURCES = Kernel/*.o wxOil/*.o tools/*.o wxXtra/*.o + @DARWIN_LINK_FALSE@XaraLX_LDSOURCE = -Wl,--start-group $(XaraLX_SOURCES) -Wl,--end-group + @DARWIN_LINK_TRUE@XaraLX_LDSOURCE = $(XaraLX_SOURCES) +! XaraLX_LDFLAGS = --debug -L$(srcdir)/$(CDRAW_LIB_DIR) $(GTK_LIBS) $(WX_LIBS) $(LIBS) $(LIBXML2_LIBS) -lCDraw + UNZIP = unzip + ACLOCAL_AMFLAGS = -I m4 + all: all-recursive