From patchwork Mon Jan 23 03:32:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46350 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 8D48027BBED; Mon, 23 Jan 2023 03:34:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 C457C27BBEB for ; Mon, 23 Jan 2023 03:34:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJnau-0006AZ-Ma; Sun, 22 Jan 2023 22:34:04 -0500 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 1pJnas-0006AR-Og for guix-patches@gnu.org; Sun, 22 Jan 2023 22:34:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJnas-00082V-F7 for guix-patches@gnu.org; Sun, 22 Jan 2023 22:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJnas-00054l-Ac for guix-patches@gnu.org; Sun, 22 Jan 2023 22:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61015] [PATCH core-updates 1/9] gnu: docbook-xml: Use copy-build-system. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Jan 2023 03:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61015@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61015-submit@debbugs.gnu.org id=B61015.167444479019446 (code B ref 61015); Mon, 23 Jan 2023 03:34:02 +0000 Received: (at 61015) by debbugs.gnu.org; 23 Jan 2023 03:33:10 +0000 Received: from localhost ([127.0.0.1]:52942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJna1-00053a-Nd for submit@debbugs.gnu.org; Sun, 22 Jan 2023 22:33:09 -0500 Received: from smtpmciv6.myservices.hosting ([185.26.106.201]:38798) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJnZx-00053P-23 for 61015@debbugs.gnu.org; Sun, 22 Jan 2023 22:33:07 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv6.myservices.hosting (Postfix) with ESMTP id 100F92077E for <61015@debbugs.gnu.org>; Mon, 23 Jan 2023 04:33:03 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id A589380096; Mon, 23 Jan 2023 04:33:03 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 9t20yrOS3-2B; Mon, 23 Jan 2023 04:33:03 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 09C6180093; Mon, 23 Jan 2023 04:33:02 +0100 (CET) From: Bruno Victal Date: Mon, 23 Jan 2023 03:32:47 +0000 Message-Id: X-Mailer: git-send-email 2.38.1 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 (docbook-xml-5) [build-system]: Switch to copy-build-system. [source][arguments]: Adapt to copy-build-system. --- gnu/packages/docbook.scm | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index f66ce4b959..a670eaa7f4 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -59,27 +59,15 @@ (define-public docbook-xml-5 (sha256 (base32 "1iz3hq1lqgnshvlz4j9gvh4jy1ml74qf90vqf2ikbq0h4i2xzybs")))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((unzip - (string-append (assoc-ref %build-inputs "unzip") - "/bin/unzip")) - (source (assoc-ref %build-inputs "source")) - (out (assoc-ref %outputs "out")) - (dtd (string-append out "/xml/dtd/docbook"))) - (invoke unzip source) - (mkdir-p dtd) - (copy-recursively (string-append "docbook-" ,version) dtd) - (with-directory-excursion dtd - (substitute* (string-append out "/xml/dtd/docbook/catalog.xml") - (("uri=\"") - (string-append - "uri=\"file://" dtd "/"))) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (let ((dtd-path (string-append #$output "/xml/dtd/docbook"))) + (copy-recursively "." dtd-path))))))) (native-inputs (list unzip)) (home-page "https://docbook.org") (synopsis "DocBook XML DTDs for document authoring")