diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 15cb5ea61cce..145672cad380 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 000000000000..598f506118f2 --- /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 diff --git a/pkgs/build-support/setup-hooks/build-single-xml-catalog.sh b/pkgs/build-support/setup-hooks/build-single-xml-catalog.sh deleted file mode 100644 index 1545b229f038..000000000000 --- a/pkgs/build-support/setup-hooks/build-single-xml-catalog.sh +++ /dev/null @@ -1,21 +0,0 @@ -# Creates a single XML catalog that references the catalogs found by -# findXMLCatalogs. -# Useful for situations where only one catalog is expected. -buildSingleXMLCatalog() { - echo '' > catalog.xml - echo '' >> catalog.xml - - catalogs=$(echo $XML_CATALOG_FILES | tr " " "\n") - for x in $catalogs - do - echo ' ' >> catalog.xml - done - - echo '' >> catalog.xml -} - -if [ -z "$buildSingleXMLCatalogHookDone" ]; then - buildSingleXMLCatalogHookDone=1 - - envHooks+=(buildSingleXMLCatalog) -fi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a4707bf1354..875419fbd1fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -359,10 +359,6 @@ with pkgs; findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; - buildSingleXMLCatalog = makeSetupHook { - deps = [ findXMLCatalogs ]; - } ../build-support/setup-hooks/build-single-xml-catalog.sh; - wrapGAppsHook = makeSetupHook { deps = [ gnome3.dconf.lib gnome3.gtk librsvg makeWrapper ]; } ../build-support/setup-hooks/wrap-gapps-hook.sh;