diff options
| author | Tyler Compton <xaviosx@gmail.com> | 2018-01-02 00:58:20 -0700 |
|---|---|---|
| committer | Tyler Compton <xaviosx@gmail.com> | 2018-01-02 00:58:20 -0700 |
| commit | a5880ace7fbc4359d3f0d8621fff16a0977283a1 (patch) | |
| tree | 8e4be5a252e10746546f205b7770ec5190df07b2 /pkgs/applications/misc/lxterminal | |
| parent | b1d1679d5c0d3eed2c99822525da50ea1a0bec0f (diff) | |
lxterminal: patch m4 to respect XML_CATALOG_FILES
The patch removes the need for a separate script to combine existing catalog files, making the package simpler.
Diffstat (limited to 'pkgs/applications/misc/lxterminal')
| -rw-r--r-- | pkgs/applications/misc/lxterminal/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch | 15 |
2 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 15cb5ea61cce0..145672cad380a 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk2, vte , libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs -, buildSingleXMLCatalog }: let version = "0.3.1"; in @@ -15,12 +14,15 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-man" - "--with-xml-catalog=../catalog.xml" # Generated by buildSingleXMLCatalog ]; buildInputs = [ automake autoconf intltool pkgconfig gtk2 vte libxslt docbook_xml_dtd_412 - docbook_xml_xslt libxml2 findXMLCatalogs buildSingleXMLCatalog + docbook_xml_xslt libxml2 findXMLCatalogs + ]; + + patches = [ + ./respect-xml-catalog-files-var.patch ]; preConfigure = '' diff --git a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch new file mode 100644 index 0000000000000..598f506118f29 --- /dev/null +++ b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch @@ -0,0 +1,15 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index be626c5..b449b1b 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], + [ + AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl + AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) +- if $jh_found_xmlcatalog && \ +- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then ++ # empty argument forces libxml to use XML_CATALOG_FILES variable ++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then + AC_MSG_RESULT([found]) + ifelse([$3],,,[$3 + ])dnl |