[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65479] [PATCH core-updates v2 53/62] gnu: gtk-doc: Rewrite with G-E
From: |
Bruno Victal |
Subject: |
[bug#65479] [PATCH core-updates v2 53/62] gnu: gtk-doc: Rewrite with G-Expressions. |
Date: |
Sat, 23 Sep 2023 15:20:28 +0100 |
* gnu/packages/gtk.scm (gtk-doc): Rewrite with G-Expressions.
---
gnu/packages/gtk.scm | 46 +++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index a49acc24c1..87ce01dc19 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -2170,36 +2170,38 @@ (define-public gtk-doc
(search-patches "gtk-doc-respect-xml-catalog.patch"))))
(build-system meson-build-system)
(arguments
- `(#:parallel-tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-gtk-doc-scan
- (lambda* (#:key inputs #:allow-other-keys)
+ (list
+ #: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")
- (string-append (assoc-ref inputs "docbook-xsl")
- "/xml/xsl/docbook-xsl-"
- ,(package-version docbook-xsl)
- "/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")
- (string-append (assoc-ref inputs "docbook-xsl")
- "/xml/xsl/docbook-xsl-"
- ,(package-version docbook-xsl)
- "/common/en.xml")))
- #t))
+ #$(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"
(("annotations.sh bugs.sh empty.sh fail.sh gobject.sh
program.sh")
- ""))
- #t))
+ ""))))
(add-after 'install 'wrap-executables
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (for-each (lambda (prog)
- (wrap-program prog
- `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))))
- (find-files (string-append out "/bin")))))))))
+ (lambda _
+ (for-each (lambda (prog)
+ (wrap-program prog
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))))
+ (find-files (string-append #$output "/bin"))))))))
(native-inputs
(list gettext-minimal
`(,glib "bin")
--
2.41.0
- [bug#65479] [PATCH core-updates v2 54/62] gnu: gtk-doc: Wrap XML_CATALOG_FILES., (continued)
- [bug#65479] [PATCH core-updates v2 54/62] gnu: gtk-doc: Wrap XML_CATALOG_FILES., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 50/62] gnu: tunctl: Update comment., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 43/62] gnu: vmpk: Drop docbook workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 49/62] gnu: alsa-utils: Rewrite with G-Expressions., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 47/62] gnu: libnotify: Split documentation., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 48/62] gnu: alsa-utils: Build manpages., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 44/62] gnu: iputils: Use docbook-xml-5.0.1., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 55/62] gnu: gtk-doc: Remove leftovers., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 41/62] gnu: tdb: Build manpages., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 52/62] gnu: git: Drop docbook workarounds., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 53/62] gnu: gtk-doc: Rewrite with G-Expressions.,
Bruno Victal <=
- [bug#65479] [PATCH core-updates v2 56/62] gnu: libstdc++-doc: Rewrite with G-Expressions., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 60/62] gnu: Remove unneeded libxml2 from native-inputs. (xmlto), Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 57/62] gnu: libstdc++-doc: Build libstdc++ info documentation., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 61/62] gnu: Remove unneeded libxml2 from native-inputs. (gtk-doc), Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 58/62] gnu: perf: Remove libxml2., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 62/62] gnu: Remove docbook-xsl-1.79.1., Bruno Victal, 2023/09/23