[bug#65479] [PATCH 54/61] gnu: gtk-doc: Wrap XML_CATALOG_FILES.

[Bruno Victal]

Prefer XML catalog resolution over substitutions on XML files.

* gnu/packages/gtk.scm (gtk-doc)[arguments]<#:phases>: Remove
'patch-gtk-doc-scan. Wrap XML_CATALOG_FILES within 'wrap-executables.
---
 gnu/packages/gtk.scm | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index a89d5709cc..508f836077 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -2174,23 +2174,6 @@ (define-public gtk-doc
       #:parallel-tests? #f
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-gtk-doc-scan
-            ;; Use a substitution to avoid setting docbook-xsl as a
-            ;; propagated input.
-            (lambda _
-             (substitute* "gtk-doc.xsl"
-               
(("http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl";)
-                #$(let ((docbook-xsl (this-package-input "docbook-xsl")))
-                    (file-append docbook-xsl
-                                 "/xml/xsl/" (package-name docbook-xsl)
-                                 "-" (package-version docbook-xsl)
-                                 "/html/chunk.xsl")))
-               
(("http://docbook.sourceforge.net/release/xsl/current/common/en.xml";)
-                #$(let ((docbook-xsl (this-package-input "docbook-xsl")))
-                    (file-append docbook-xsl
-                                 "/xml/xsl/" (package-name docbook-xsl)
-                                 "-" (package-version docbook-xsl)
-                                 "/common/en.xsl"))))))
          (add-after 'unpack 'disable-failing-tests
            (lambda _
              (substitute* "tests/Makefile.am"
@@ -2198,10 +2181,17 @@ (define-public gtk-doc
                 ""))))
          (add-after 'install 'wrap-executables
            (lambda _
-             (for-each (lambda (prog)
-                         (wrap-program prog
-                           `("GUIX_PYTHONPATH" ":" prefix (,(getenv 
"GUIX_PYTHONPATH")))))
-                       (find-files (string-append #$output "/bin"))))))))
+             (let ((docbook-xsl-catalog
+                    #$(let ((docbook-xsl (this-package-input "docbook-xsl")))
+                        (file-append docbook-xsl
+                                     "/xml/xsl/" (package-name docbook-xsl)
+                                     "-" (package-version docbook-xsl)
+                                     "/catalog.xml"))))
+               (for-each (lambda (prog)
+                           (wrap-program prog
+                             `("GUIX_PYTHONPATH" ":" prefix (,(getenv 
"GUIX_PYTHONPATH")))
+                             `("XML_CATALOG_FILES" " " suffix 
(,docbook-xsl-catalog))))
+                         (find-files (string-append #$output "/bin")))))))))
     (native-inputs
      (list gettext-minimal
            `(,glib "bin")
-- 
2.40.1