JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

partial fix for linking problems

Browse Source 
svn path=/nixpkgs/trunk/; revision=8696
This commit is contained in:
Armijn Hemel 2007-05-14 22:49:45 +00:00
parent 1171d3e22c
commit ceb097cd01
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/xara/default.nix
View File

@ -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];
}

20
pkgs/applications/graphics/xara/gtk_cflags.patch Normal file
View File

@ -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