diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-09-06 09:52:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-06 09:52:52 +0100 |
commit | 151dcce6d17f0724de7e2f9172317984faf56e7a (patch) | |
tree | 67cc1506bdf04547d05ca7a2bcf3e3c039043bc5 /pkgs/tools | |
parent | ff969fed9898e735d74f669a963d361bd67e0e9c (diff) | |
parent | 34c089e7ce9647ddba1b557c3c2bdb09930ac2d8 (diff) | |
download | nixlib-151dcce6d17f0724de7e2f9172317984faf56e7a.tar nixlib-151dcce6d17f0724de7e2f9172317984faf56e7a.tar.gz nixlib-151dcce6d17f0724de7e2f9172317984faf56e7a.tar.bz2 nixlib-151dcce6d17f0724de7e2f9172317984faf56e7a.tar.lz nixlib-151dcce6d17f0724de7e2f9172317984faf56e7a.tar.xz nixlib-151dcce6d17f0724de7e2f9172317984faf56e7a.tar.zst nixlib-151dcce6d17f0724de7e2f9172317984faf56e7a.zip |
Merge pull request #68172 from jonringer/bump-xmlroff
xmlroff: 0.6.2 -> 0.6.3
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/typesetting/xmlroff/default.nix | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index df9a607d4f27..eb026e5557eb 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -1,49 +1,55 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt, perl -, glib, pango, pangoxsl, gtk2, libtool, autoconf, automake }: +{ stdenv, fetchFromGitHub +, autoreconfHook +, gtk2 +, libxml2 +, libxslt +, pango +, pangoxsl +, perl +, pkgconfig +, popt +}: stdenv.mkDerivation rec { pname = "xmlroff"; - version = "0.6.2"; + version = "0.6.3"; - src = fetchurl { - url = "https://github.com/xmlroff/xmlroff/archive/v${version}.tar.gz"; - sha256 = "1sczn6xjczsfdxlbjqv4xqlki2a95y2s8ih2nl9v1vhqfk17fiww"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0dgp72094lx9i9gvg21pp8ak7bg39707rdf6wz011p9s6n6lrq5g"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - autoconf - automake libxml2 libxslt - libtool - glib pango pangoxsl gtk2 popt ]; + sourceRoot = "source/xmlroff/"; + + enableParallelBuilding = true; + configureScript = "./autogen.sh"; configureFlags = [ - "--disable-pangoxsl" "--disable-gp" ]; - hardeningDisable = [ "format" ]; - preBuild = '' substituteInPlace tools/insert-file-as-string.pl --replace "/usr/bin/perl" "${perl}/bin/perl" - substituteInPlace Makefile --replace "docs" "" + substituteInPlace Makefile --replace "docs" "" # docs target wants to download from network ''; - sourceRoot = "${pname}-${version}/xmlroff/"; - - patches = [./xmlroff.patch]; - - meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsd3; + meta = with stdenv.lib; { + description = "XSL Formatter"; + homepage = "http://xmlroff.org/"; + platforms = platforms.unix; + license = licenses.bsd3; }; } |