diff options
| author | Bruno Victal <mirai@makinata.eu> | 2023-10-09 21:06:43 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:42:13 +0200 |
| commit | 443965fee1bad5debc9fd717baf4a4761c2f9266 (patch) | |
| tree | 5d3d6a0fe25b0efc78fea5c227688105e0fab130 | |
| parent | f9660a2cfac4e18c160ab2c5a175f4560bac5002 (diff) | |
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>
| -rw-r--r-- | gnu/packages/gtk.scm | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3db7fad4e9..7d9e10c740 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -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") |