summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorBruno Victal <mirai@makinata.eu>2023-10-09 21:06:04 +0100
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-10-10 21:10:56 -0400
commit15720e4bdb60dddcb7d99219c73b40032e6ef27c (patch)
tree34b9460f544d3418b2d58fca139048e6b2683ef6 /gnu
parent80b59579b18fe7e315fe774a25700bee393231c1 (diff)
gnu: docbook2x: Use search-path-as-list for wrapping.
* gnu/packages/docbook.scm (docbook2x)[arguments]<#:phases>: Refactor 'wrap-programs phase to use search-path-as-list. <#:modules>: Add (srfi srfi-26). Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/docbook.scm31
1 files changed, 17 insertions, 14 deletions
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 8c5cc74ab9..883d2db818 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -888,6 +888,9 @@ Detect the differences in markup between two SGML files.
(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
@@ -898,20 +901,20 @@ Detect the differences in markup between two SGML files.
(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)))