From patchwork Wed Aug 25 18:03:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32280 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 F316A27BBE3; Wed, 25 Aug 2021 19:06:25 +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 BAF7927BBE1 for ; Wed, 25 Aug 2021 19:06:25 +0100 (BST) Received: from localhost ([::1]:34332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxI8-0004IA-RZ for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:06:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxHm-0003Zh-SF for guix-patches@gnu.org; Wed, 25 Aug 2021 14:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36233) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxHm-0002R5-Kp for guix-patches@gnu.org; Wed, 25 Aug 2021 14:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxHm-0002vz-FV for guix-patches@gnu.org; Wed, 25 Aug 2021 14:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 38/52] gnu: at-spi2-core: Find docbook when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991471411072 (code B ref 50201); Wed, 25 Aug 2021 18:06:02 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:05:14 +0000 Received: from localhost ([127.0.0.1]:47755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxGw-0002sL-LE for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:05:14 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:55648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFb-0002ha-Mx for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:49 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3k2500G0mfAB401u3n9T; Wed, 25 Aug 2021 20:03:47 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:18 +0200 Message-Id: <20210825180332.5720-38-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914627; bh=wdfhCARkcIWUnb8mXmHCYkrYKMAMPHckl0VyL49Wr+o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dRoaAPBwLMlYhamrYKtalVIsTq7g9T8JYxKW35buL5iNvwyyZOKXkdDA2GTODVvTH eMjaM4Cj6j5DgGA2SvLe9iwVHnhjZ3pImYFBbWKgC623+QWptSx5wJsJdw66kDUtnH zlGVEqdSt9UH2M7yRvLnqumhWk+LZmIesfqtBLPt1+h3i6lwjlNe1elfVQor7RKUdZ xaCXRUJNngBK4CNwSFOrMm7nk/9UOnCvDtOZqa4cu32mOviPUTOPfWd5ox+5QRipV7 i4MxGCUPZY3PvsZSJ3POOeR2nVxNWcEe5BhpacDsbloS+dNDvxcPa1Hik1mcxBPLDB D6bgni2F5x5sQ== 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}: Look up "docbook-sxml" in 'native-inputs' instead of 'inputs' when cross-compiling. --- gnu/packages/gtk.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 73b805f6fe..49208716eb 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -744,10 +744,17 @@ 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 inputs #:allow-other-keys) - (let* ((xmldoc (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook"))) + (lambda* (#:key ,@(if (%current-target-system) + '(native-inputs) + '()) inputs #:allow-other-keys) + (let* ((xmldoc + (string-append (assoc-ref ,(if (%current-target-system) + '(or native-inputs inputs) + 'inputs) + "docbook-xml") + "/xml/dtd/docbook"))) (substitute* "doc/libatspi/libatspi-docs.sgml" (("http://.*/docbookx\\.dtd") (string-append xmldoc "/docbookx.dtd")))