[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65479] [PATCH core-updates v3 16/63] gnu: docbook2x: Use search-pat
From: |
Bruno Victal |
Subject: |
[bug#65479] [PATCH core-updates v3 16/63] gnu: docbook2x: Use search-path-as-list for wrapping. |
Date: |
Mon, 9 Oct 2023 21:06:04 +0100 |
* gnu/packages/docbook.scm (docbook2x)[arguments]<#:phases>: Refactor
'wrap-programs phase to use search-path-as-list.
<#:modules>: Add (srfi srfi-26).
---
gnu/packages/docbook.scm | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 6da168dd52..52295b7db0 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -889,6 +889,9 @@ (define-public docbook2x
(build-system gnu-build-system)
(arguments
(list
+ #:modules '((guix build gnu-build-system)
+ (guix build utils)
+ (srfi srfi-26))
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'move-doc
@@ -899,20 +902,20 @@ (define-public docbook2x
(rename-file old new))))
(add-after 'install 'wrap-programs
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((programs
- (map (lambda (p)
- (search-input-file outputs
- (string-append "bin/" p)))
- '("db2x_manxml" "db2x_texixml" "db2x_xsltproc"
- "docbook2man" "docbook2texi")))
- (perl5lib
- '#$(map (lambda (i)
- (file-append (this-package-input i)
- "/lib/perl5/site_perl"))
- '("perl-xml-namespacesupport"
- "perl-xml-parser"
- "perl-xml-sax"
- "perl-xml-sax-base"))))
+ (let ((programs
+ (map (lambda (p)
+ (search-input-file outputs
+ (string-append "bin/" p)))
+ '("db2x_manxml" "db2x_texixml" "db2x_xsltproc"
+ "docbook2man" "docbook2texi")))
+ (perl5lib
+ (search-path-as-list
+ '("/lib/perl5/site_perl")
+ (map (cut assoc-ref inputs <>)
+ '("perl-xml-namespacesupport"
+ "perl-xml-parser"
+ "perl-xml-sax"
+ "perl-xml-sax-base")))))
(map (lambda (program)
(wrap-program program
`("PERL5LIB" ":" prefix ,perl5lib)))
--
2.41.0
- [bug#65479] [PATCH core-updates v3 19/63] gnu: dblatex: Split documentation., (continued)
- [bug#65479] [PATCH core-updates v3 19/63] gnu: dblatex: Split documentation., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 22/63] gnu: lilypond: Use dblatex/stable., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 10/63] gnu: docbook: Remove leftovers., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 13/63] gnu: docbook2x: Fix sgml2xml-isoent and add test dependencies., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 11/63] gnu: docbook-utils: Import patches from debian., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 04/63] gnu: libxslt: Set search-paths for XML and SGML catalogs., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 34/63] gnu: git-crypt: Remove docbook workarounds., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 32/63] gnu: criu: Drop xmlto workaround., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 42/63] gnu: tdb: Build manpages., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 45/63] gnu: iputils: Use docbook-xml-5.0.1., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 16/63] gnu: docbook2x: Use search-path-as-list for wrapping.,
Bruno Victal <=
- [bug#65479] [PATCH core-updates v3 29/63] gnu: udisks: Rewrite using G-Expressions., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 21/63] gnu: dblatex: Fix missing texlive binaries and fig2dev., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 18/63] gnu: dblatex: Add libxslt native-search-paths to its own., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 23/63] gnu: xmlto: Rewrite with G-Expressions., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 14/63] gnu: docbook2x: Split documentation., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 41/63] gnu: sssd: Drop xmllint workaround., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 35/63] gnu: gnome-session: Build documentation., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 43/63] gnu: drumstick: Drop docbook workaround., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 44/63] gnu: vmpk: Drop docbook workaround., Bruno Victal, 2023/10/09
- [bug#65479] [PATCH core-updates v3 37/63] gnu: metapixel: Rewrite with G-Expressions., Bruno Victal, 2023/10/09