From patchwork Fri Oct 1 14:21:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33503 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 F38D827BBE3; Fri, 1 Oct 2021 15:27:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B9A5D27BBE1 for ; Fri, 1 Oct 2021 15:27:54 +0100 (BST) Received: from localhost ([::1]:46788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJVx-0004UB-Qc for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:27:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUK-0002Ar-5O for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45432) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUJ-0000cO-TF for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUJ-0005id-P0 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309832121730 (code B ref 50905); Fri, 01 Oct 2021 14:26:11 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:21 +0000 Received: from localhost ([127.0.0.1]:56945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTU-0005eK-VP for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:21 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ7-0005Ti-D2 for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:54 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrMj; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:33 +0200 Message-Id: <20211001142140.17027-31-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=RriO5a8YOCmfeZKTUQhZ+SktKBPPQdjUsMMdvni4RAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KH++Vultam/UrLFMIIGR7rH6xo6/Q0CXTdJuorHE7r+sBe8oR6MiHOhDHG6KguqLu xSdVUwAPEgtVxfr8f8TkkvYd7ZorLbLIyd5GRFumzWbEAgu+CPT5XBrK8SsrtabNki RRS9FXp6Mht6VDrQKmI9nqoC1qharbALVIZdf+4QpFdTBqEEyyhM/zvCFlLD4M5eq9 Np9gmuPuLc/VCY5arLnQtUDsgZAzJbGkSUrI1fwYO10i2DNGmxFL8+IBmTpQbi3Tnl MJGExaQc3NsUJMIaJlPLzYeLbG0kxrWltCk+8fAJRSHDRaVGtsVxvZrWWkMFJno1JI 3gxXOi8dtJLvg== 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (json-glib)[arguments]<#:phases>{patch-docbook}: Unconditionally look in (or native-inputs inputs) for docbook-xml and docbook-xsl. --- gnu/packages/gnome.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 497713cddc..57d9a9be79 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4607,24 +4607,17 @@ configuration storage systems.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Use (or native-inputs inputs) - ;; unconditionally. - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "doc" (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) + (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") "/xml/dtd/docbook/"))) (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/")))) #t)) ;; When cross-compiling, there are no docs to move.