From patchwork Mon Oct 9 20:06:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54665 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DB58F27BBE9; Mon, 9 Oct 2023 21:09:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CA08127BBE2 for ; Mon, 9 Oct 2023 21:09:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpwYo-0006zB-PV; Mon, 09 Oct 2023 16:09:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qpwYX-0006eo-Vm for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:49 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qpwYX-0008Ao-HV for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpwYs-0002cz-9J for guix-patches@gnu.org; Mon, 09 Oct 2023 16:09:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 16/63] gnu: docbook2x: Use search-path-as-list for wrapping. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 20:09:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.16968821109823 (code B ref 65479); Mon, 09 Oct 2023 20:09:06 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 20:08:30 +0000 Received: from localhost ([127.0.0.1]:33372 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwYI-0002YA-0F for submit@debbugs.gnu.org; Mon, 09 Oct 2023 16:08:30 -0400 Received: from smtpm3.myservices.hosting ([185.26.105.234]:59360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwXu-0002TE-8u for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 16:08:21 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id 2208C2102F for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 22:07:22 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 8864C8009E; Mon, 9 Oct 2023 22:07:22 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 8J3jKRCuUyz9; Mon, 9 Oct 2023 22:07:22 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id D64AC80060; Mon, 9 Oct 2023 22:07:18 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:04 +0100 Message-ID: <4fefefa1fe6e2b3e77e62b6b5ed721a1ecd9afb6.1696881354.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)))