summary refs log tree commit diff
path: root/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2017-10-02 15:40:26 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-05-11 06:06:40 +0200
commit215dcb728547a8693fa458e3b554a458cce301e9 (patch)
treea23452be90ca75bac9056d4fd7f9d1ad70b07e1c /pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch
parent6db7f92cc2af827e8b8b181bf5ed828a1d0f141d (diff)
downloadnixpkgs-215dcb728547a8693fa458e3b554a458cce301e9.tar
nixpkgs-215dcb728547a8693fa458e3b554a458cce301e9.tar.gz
nixpkgs-215dcb728547a8693fa458e3b554a458cce301e9.tar.bz2
nixpkgs-215dcb728547a8693fa458e3b554a458cce301e9.tar.lz
nixpkgs-215dcb728547a8693fa458e3b554a458cce301e9.tar.xz
nixpkgs-215dcb728547a8693fa458e3b554a458cce301e9.tar.zst
nixpkgs-215dcb728547a8693fa458e3b554a458cce301e9.zip
flatpak: init at 0.11.7
Diffstat (limited to 'pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch')
-rw-r--r--pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch b/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch
new file mode 100644
index 00000000000..0e259aebd8a
--- /dev/null
+++ b/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch
@@ -0,0 +1,13 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -40,8 +40,8 @@
+ [
+   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