diff mbox series

[bug#65479,core-updates,v3,16/63] gnu: docbook2x: Use search-path-as-list for wrapping.

Message ID 4fefefa1fe6e2b3e77e62b6b5ed721a1ecd9afb6.1696881354.git.mirai@makinata.eu
State New
Headers show
Series Docbook & XML/SGML improvements | expand

Commit Message

Bruno Victal Oct. 9, 2023, 8:06 p.m. UTC 
* 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 mbox series

Patch

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)))