diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2007-05-14 22:49:45 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2007-05-14 22:49:45 +0000 |
| commit | ceb097cd01fefadc1ae971bf999f493b712ced6d (patch) | |
| tree | 2614e8da6b8af5ff0fb958df2615c156a200c38e /pkgs/applications/graphics | |
| parent | 1171d3e22c7d1f8ab0c89f4f9ffeaf18ebd36eec (diff) | |
| download | nixlib-ceb097cd01fefadc1ae971bf999f493b712ced6d.tar nixlib-ceb097cd01fefadc1ae971bf999f493b712ced6d.tar.gz nixlib-ceb097cd01fefadc1ae971bf999f493b712ced6d.tar.bz2 nixlib-ceb097cd01fefadc1ae971bf999f493b712ced6d.tar.lz nixlib-ceb097cd01fefadc1ae971bf999f493b712ced6d.tar.xz nixlib-ceb097cd01fefadc1ae971bf999f493b712ced6d.tar.zst nixlib-ceb097cd01fefadc1ae971bf999f493b712ced6d.zip | |
partial fix for linking problems
svn path=/nixpkgs/trunk/; revision=8696
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/xara/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/xara/gtk_cflags.patch | 20 |
2 files changed, 22 insertions, 0 deletions
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 |