From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id +NLcKpqGJmGQmQAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:06:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 8DRaJpqGJmGpawAAbx9fmQ (envelope-from ) for ; Wed, 25 Aug 2021 18:06:18 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7A38C2BAEE for ; Wed, 25 Aug 2021 20:06:18 +0200 (CEST) Received: from localhost ([::1]:34332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxI1-0004IA-Ho for larch@yhetil.org; Wed, 25 Aug 2021 14:06:17 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629914778; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=wdfhCARkcIWUnb8mXmHCYkrYKMAMPHckl0VyL49Wr+o=; b=qkRY2CvUZNr9GS1FR4XykNvHmIa3JnsA9ulxkDwNRg3vyRAtMzljgrMhPMEloDm4Tmzpx1 f0jUHzk4lU1bSmRBv29xfEcSpSbo2Pk7OWCsAYJKJNbh5Mu87UTf0tigiu3b0s/NTpJcBV fwdr9XRzvJ6nGWa18xypBhGQTlVBwt3xochSVU2ZXk2gunDUSafm//Y/Nxr7kBjrTZI+Ot 6BjtWXu7xalTfgXVLsdeWedAkg/F8Xkrv5kAik46lOEyPicSktSPKuS46tB5UQbHVr08aQ tL5bLaFiY4/ZHhngoJbe6dWfggvx6dCfd64F+/DTIO6+1syEEFvrc6UQDrxRqw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914778; a=rsa-sha256; cv=none; b=CSrBv1RqBIDyhsJHeNoVFVJF1szC0b5bVgtWpbDDt7zjG+IkFzYPQKMVNc9wdrySpdE+aU tQIa4wvjDe9mCwGcrVZ9JFpMSB0LwDkGGxEQOd6+dKLvjwlBCJ3Q+ACZW9tJmNRcv0ssa3 eE7wzGnwe6ZRlWWK6aTJVnJln24/Dfj5sBEiAYFVoZ+c17l3qaf9UDY4JN7+g4y85RDZZx Yo01fj88sMrGB0L0GXo49Yezoi/lMh/QVDEPsu2CfsTa59q8QdzowbvWL+ri/QhVpSJae/ dY5g8DnnS67Q3Y75EBNwLyUvxVLWvJA/Zhzgv6fL349/bKu7qa+ZjboOnXiF3A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=dRoaAPBw; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=dRoaAPBw; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 7A38C2BAEE X-Spam-Score: 3.68 X-Migadu-Scanner: scn0.migadu.com X-TUID: MhSNDVA0kFhi * 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"))) -- 2.33.0