From f6d83c2ef9fd2a5d1957bf36a9dc756f6d2acf83 Mon Sep 17 00:00:00 2001 From: Matthew O'Gorman Date: Tue, 26 Mar 2019 23:43:06 -0400 Subject: [PATCH] chafa: init at 1.0.1 --- pkgs/tools/misc/chafa/default.nix | 45 ++++++++++++++++++++ pkgs/tools/misc/chafa/xmlcatalog_patch.patch | 23 ++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 70 insertions(+) create mode 100644 pkgs/tools/misc/chafa/default.nix create mode 100644 pkgs/tools/misc/chafa/xmlcatalog_patch.patch diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix new file mode 100644 index 000000000000..00ab4cd75d0c --- /dev/null +++ b/pkgs/tools/misc/chafa/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/tools/misc/chafa/xmlcatalog_patch.patch b/pkgs/tools/misc/chafa/xmlcatalog_patch.patch new file mode 100644 index 000000000000..6bf988d6117f --- /dev/null +++ b/pkgs/tools/misc/chafa/xmlcatalog_patch.patch @@ -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]) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 980b5c44904e..4ceeceb67ef8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };