disable local build of pangoxsl, add patch to remove "pangoxsl" from SUBDIRS,
otherwise it will still try to build the local pangoxsl (and fail) svn path=/nixpkgs/trunk/; revision=5468
This commit is contained in:
parent
b4ecec05c5
commit
a33dc947c6
|
@ -2,10 +2,11 @@
|
|||
, glib, pango, libgnomeprint, pangoxsl, gtk}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xmlroff-0.3.5";
|
||||
#name = "xmlroff-0.3.5";
|
||||
name = "xmlroff-0.3.98";
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/xmlroff-0.3.5.tar.gz;
|
||||
md5 = "4f03dffa0451c28e7c777f6ee1fa38da";
|
||||
url = http://surfnet.dl.sourceforge.net/sourceforge/xmlroff/xmlroff-0.3.98.tar.gz;
|
||||
md5 = "6c1d05b6480e98870751bf9102ea68e2";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -19,4 +20,8 @@ stdenv.mkDerivation {
|
|||
gtk
|
||||
popt
|
||||
];
|
||||
|
||||
configureFlags = "--disable-pangoxsl";
|
||||
|
||||
patches = [./xmlroff.patch];
|
||||
}
|
||||
|
|
12
pkgs/tools/typesetting/xmlroff/xmlroff.patch
Normal file
12
pkgs/tools/typesetting/xmlroff/xmlroff.patch
Normal file
|
@ -0,0 +1,12 @@
|
|||
diff -ruN xmlroff-0.3.98/Makefile.in xmlroff-0.3.98.new/Makefile.in
|
||||
--- xmlroff-0.3.98/Makefile.in 2006-05-30 17:46:37.000000000 +0200
|
||||
+++ xmlroff-0.3.98.new/Makefile.in 2006-06-18 13:47:37.000000000 +0200
|
||||
@@ -288,7 +288,7 @@
|
||||
subdirs = @subdirs@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
-SUBDIRS = pangoxsl libfo area fo datatype property expr util . examples docs
|
||||
+SUBDIRS = libfo area fo datatype property expr util . examples docs
|
||||
@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
|
||||
INCLUDES = \
|
||||
-DG_LOG_DOMAIN=\"libfo\" \
|
Loading…
Reference in a new issue