diff options
| author | Domen Kožar <domen@dev.si> | 2014-11-24 08:43:34 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-11-24 08:43:43 +0100 |
| commit | d8e89ebd4b8feaf3326350267c43b4e4ace1beb6 (patch) | |
| tree | f6dfc2377d6a54787075bdf1b6fda670e1ba1e88 /pkgs/tools/typesetting/xmlroff | |
| parent | 5f599a3ddd622ce11034a550654d3e5c970d46ac (diff) | |
| download | nixpkgs-d8e89ebd4b8feaf3326350267c43b4e4ace1beb6.tar nixpkgs-d8e89ebd4b8feaf3326350267c43b4e4ace1beb6.tar.gz nixpkgs-d8e89ebd4b8feaf3326350267c43b4e4ace1beb6.tar.bz2 nixpkgs-d8e89ebd4b8feaf3326350267c43b4e4ace1beb6.tar.lz nixpkgs-d8e89ebd4b8feaf3326350267c43b4e4ace1beb6.tar.xz nixpkgs-d8e89ebd4b8feaf3326350267c43b4e4ace1beb6.tar.zst nixpkgs-d8e89ebd4b8feaf3326350267c43b4e4ace1beb6.zip | |
xmlroff: 0.3.98 -> 0.6.2
Diffstat (limited to 'pkgs/tools/typesetting/xmlroff')
| -rw-r--r-- | pkgs/tools/typesetting/xmlroff/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/xmlroff/xmlroff.patch | 23 |
2 files changed, 32 insertions, 21 deletions
diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index 1545b626a7f..5f118e636b8 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -1,27 +1,39 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt -, glib, pango, libgnomeprint, pangoxsl, gtk}: +{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt, perl +, glib, pango, pangoxsl, gtk, libtool, autoconf, automake }: + +stdenv.mkDerivation rec { + name = "xmlroff-${version}"; + version = "0.6.2"; -stdenv.mkDerivation { - #name = "xmlroff-0.3.5"; - name = "xmlroff-0.3.98"; src = fetchurl { - url = mirror://sourceforge/xmlroff/xmlroff-0.3.98.tar.gz; - sha256 = "0pg7zc8ri0xzmdk30vnyd84wy8yn973h1bnrvibv71q44s6xhwp2"; + url = "https://github.com/xmlroff/xmlroff/archive/v${version}.tar.gz"; + sha256 = "1sczn6xjczsfdxlbjqv4xqlki2a95y2s8ih2nl9v1vhqfk17fiww"; }; buildInputs = [ pkgconfig + autoconf + automake libxml2 libxslt + libtool glib pango - libgnomeprint pangoxsl gtk popt ]; - configureFlags = "--disable-pangoxsl"; + configureScript = "./autogen.sh"; + + configureFlags = "--disable-pangoxsl --disable-gp"; + + preBuild = '' + substituteInPlace tools/insert-file-as-string.pl --replace "/usr/bin/perl" "${perl}/bin/perl" + substituteInPlace Makefile --replace "docs" "" + ''; + + sourceRoot = "${name}/xmlroff/"; patches = [./xmlroff.patch]; } diff --git a/pkgs/tools/typesetting/xmlroff/xmlroff.patch b/pkgs/tools/typesetting/xmlroff/xmlroff.patch index 16bd7b0a76d..6f0246e9679 100644 --- a/pkgs/tools/typesetting/xmlroff/xmlroff.patch +++ b/pkgs/tools/typesetting/xmlroff/xmlroff.patch @@ -1,12 +1,11 @@ -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\" \ +--- xmlroff-0.6.2.orig/libfo/fo-libfo-basic.h ++++ xmlroff-0.6.2/libfo/fo-libfo-basic.h +@@ -11,8 +11,7 @@ + #define __FO_LIBFO_BASIC_H__ + + #include <stdio.h> +-#include <glib/gtypes.h> +-#include <glib/gerror.h> ++#include <glib.h> + + G_BEGIN_DECLS |