~ruther/guix-local

443965fee1bad5debc9fd717baf4a4761c2f9266 — Bruno Victal 2 years ago f9660a2 
gnu: gtk-doc: Wrap XML_CATALOG_FILES.

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.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
patch browse .tar.gz 
1 files changed, 11 insertions(+), 21 deletions(-)

M gnu/packages/gtk.scm

M gnu/packages/gtk.scm => gnu/packages/gtk.scm +11 -21
@@ 2263,23 2263,6 @@ information.")
      #: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"


@@ 2287,10 2270,17 @@ information.")
                ""))))
         (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")