uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

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

View file

@ -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])