Merge pull request #58422 from mogorman/chafa-1.0.1

chafa: init at 1.0.1
This commit is contained in:
Ryan Mulligan 2019-03-29 20:18:35 -07:00 committed by GitHub
commit aaae785f90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 70 additions and 0 deletions

@ -0,0 +1,45 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }:
stdenv.mkDerivation rec{
version = "1.0.1";
pname = "chafa";
src = fetchFromGitHub {
owner = "hpjansson";
repo = "chafa";
rev = version;
sha256 = "1i1cnzmb12pxldc7y4q1xdmybv9xkhzrjyhdvmk3qsn02p859q04";
};
nativeBuildInputs = [ autoconf
automake
libtool
pkgconfig
which
libxslt
libxml2
docbook_xml_dtd_412
docbook_xsl
];
buildInputs = [ glib imagemagick ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ];
patches = [ ./xmlcatalog_patch.patch ];
preConfigure = ''
./autogen.sh
'';
configureFlags = [ "--enable-man"
"--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"
];
meta = with stdenv.lib; {
description = "Terminal graphics for the 21st century.";
homepage = https://hpjansson.org/chafa/;
license = licenses.lgpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.mog ];
};
}

@ -0,0 +1,23 @@
diff --git a/configure.ac b/configure.ac
index 0055a70..fd4a905 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,18 +111,6 @@ AS_IF([ test "$enable_man" != no ], [
])
])
-AS_IF([test "$enable_man" != no], [
- dnl check for DocBook XSL stylesheets in the local catalog
- JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
- [DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no])
- AS_IF([ test "$have_docbook_style" != yes ], [
- AS_IF([ test "$enable_man" = yes ], [
- AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man])
- ])
- enable_man=no
- ])
-])
-
AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
AC_MSG_CHECKING([whether to generate man pages])

@ -2124,6 +2124,8 @@ in
cfssl = callPackage ../tools/security/cfssl { };
chafa = callPackage ../tools/misc/chafa { };
checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
civetweb = callPackage ../development/libraries/civetweb { };