From patchwork Fri Oct 1 14:21:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33515 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 B845327BBE3; Fri, 1 Oct 2021 15:29:02 +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 7F48C27BBE1 for ; Fri, 1 Oct 2021 15:29:02 +0100 (BST) Received: from localhost ([::1]:49306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJX3-0006DL-K1 for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:29:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUJ-0002Am-Vv for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUI-0000Zq-Lz 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 1mWJUI-0005iH-IB for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 25/38] gnu: at-spi2-core: 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:10 +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.163309831721702 (code B ref 50905); Fri, 01 Oct 2021 14:26:10 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:17 +0000 Received: from localhost ([127.0.0.1]:56939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTQ-0005ds-O6 for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Td-I6 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 0eMm260020mfAB401eMqMH; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:27 +0200 Message-Id: <20211001142140.17027-25-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=1633098110; bh=A/vKhXVf1Ixg8MY6muVmQzAsOO348cwUUuDUpPpNf1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=e6JCYD1sQ/eSMVmzxoZohTjbArDj5PsKSsfJW8l6ZmYWXh0IiJ4TwX+dVPA2rLdEj ZZ90ZHqlbtIl4+/D4gQYNVORmxNK+7nkq+MYg6lPb2qAvSl6FVUXm7XuSqRmdQVVp2 /mNlqzaBtkd1zO6AgruOjMXyPnFFtoSbBZhm+VeFWARGi+Q8VCbo3eddMbx6MsnwEd OUWRK83a4+1K3MIe+szUI83ZZBCxngYiqrZAqt/QYaJlCVfXiP6OqDg4lg95MTMNcj L6ddt2CAQB8WKaRgJuWEOXhvHKkwKsE2Cajg1Qp5u/PL+jsRZ6EnCcmNE4EEgwtIvC dCNN97BBk9htw== 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/gtk.scm (at-spi2-core)[arguments]<#:phases>{patch-docbook-sgml}: Unconditionally look in (or native-inputs inputs) for docbook-xml. --- gnu/packages/gtk.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d829218305..634a0125d8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -740,15 +740,10 @@ scaled, composited, modified, saved, or rendered.") (lambda* (#:key outputs #:allow-other-keys) (mkdir-p (string-append (assoc-ref outputs "doc") "/share")) #t)) - ;; TODO(core-updates): Unconditionally use (or native-inputs inputs) (add-after 'unpack 'patch-docbook-sgml - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (let* ((xmldoc - (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* "doc/libatspi/libatspi-docs.sgml"