From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CMC+ALeGJmEbnAAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:06:47 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 4JfXN7aGJmGEbAAAbx9fmQ (envelope-from ) for ; Wed, 25 Aug 2021 18:06:46 +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 B04E536F1 for ; Wed, 25 Aug 2021 20:06:46 +0200 (CEST) Received: from localhost ([::1]:35948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxIT-0005NE-Qb for larch@yhetil.org; Wed, 25 Aug 2021 14:06:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxHp-0003hX-Kx for guix-patches@gnu.org; Wed, 25 Aug 2021 14:06:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxHp-0002Tb-By for guix-patches@gnu.org; Wed, 25 Aug 2021 14:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxHp-0002wr-6R for guix-patches@gnu.org; Wed, 25 Aug 2021 14:06:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 47/52] gnu: wayland: Find docbook-xml 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:05 +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.162991474211180 (code B ref 50201); Wed, 25 Aug 2021 18:06:05 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:05:42 +0000 Received: from localhost ([127.0.0.1]:47769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxHN-0002td-Vv for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:05:42 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:55684) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFc-0002hs-Vm for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:50 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3n2500L0mfAB401u3o9p; Wed, 25 Aug 2021 20:03:48 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:27 +0200 Message-Id: <20210825180332.5720-47-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=1629914628; bh=ColfQF2cLOaGA5eWaVpM9KQVlgOPnO6A2eFh5snvTAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=d+Uxr/Evh8nFj9AjN53/0Dxr7+T4dDju1CxP3Kswp/KS8TLhFOtZMMTp4MUnf7AgL R0u7hiZ5tzild/1XhUksOosSJ9viwkPRcil6vWpDtR6qFm6ieuv8ePH0FbdhMK5lm5 lPREu9jBO3faRyz6IZMjSzFJu+0V41FBCN8fwXHBpDx+5I2awH/IqSTNwFP+ABV8Zz jiVUYdrMt/gBBpclW3ksaGilAzQ0585Z0Xq6E6Bk+SExaOCEmH7rdVpOrxqLumH6hR q27UMr9sc241BD5P+SY3sbMnKRp+oZm+r/yo6m5vy6/ih6eUoh7vZJPTXQ0mr5x8wa tNk1CFVj31LQw== 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=1629914806; 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=ColfQF2cLOaGA5eWaVpM9KQVlgOPnO6A2eFh5snvTAU=; b=tITihgVsSXdDSqDWuQ8y58sCDza+7vo6h89tdP6HtLZUWUJ6wrTXMqU2j7p6tds+96iuZI pFVL0dRkpnA6xM6CgfNai2OIIh9yN0+O+5z5sCcPBSH5EGrDPLbcWomvOwdQ0R8PhkhoWr CSQ65BBdSmvy/4FzF9RLy184Df8Y7dy8ot/smVU6XsGkhjFTRUXHfmh0uOZcOvIGgyl8+q VgdC6tZph1q4KDzuVl9ZU4ZRtM9+x6h9V36ETn8PdmpLcGvLxVt60kffpwn6tSWMAOfjG+ 2IequySbUkWXAoqbK/Mqfdeghm9YvYMo84V9usBCiM86snTGitpiZR+W8J0oeA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914806; a=rsa-sha256; cv=none; b=lRZv67XPc4WBNUWK8CB2w7TEzs0v6zkV+r9j1vTiD6ReRPH1Az+USI8lUB4j7xevubWdjt OzgxDZI9R0tNPZawUpFKJd7eCS9WuCOSuFO2f3Ho82q87B4V5sFj2fRwwW342t5VoswbNI 4uwcRAcciVxPxb6b6XpsvtMJvcHo3v6wrG72KSlbnks5VJ+OnxZTqBQj9u9oEAq3twBaI2 VgjO//vH3p50RvWJN6yPkmb2RxZkVWer9jn03LPUvpw1har6zMCl/O2AaGLU3eUCIKGOkD Mb5mhWC6faQgTXVaEcNBl2J52nOE1HUUAb7NZH7fAAXu6+lynRy8LVB2SjtIiw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="d+Uxr/Ev"; 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="d+Uxr/Ev"; 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: B04E536F1 X-Spam-Score: 3.68 X-Migadu-Scanner: scn0.migadu.com X-TUID: s80PjWcOox04 * gnu/packages/freedesktop.scm (wayland)[arguments]<#:phases>{patchdocbook-xml}: Look in 'native-inputs' instead of 'inputs' when cross-compiling. --- gnu/packages/freedesktop.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9384ecd3f2..2e696f3848 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -979,14 +979,22 @@ Python.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook-xml - (lambda* (#:key inputs #:allow-other-keys) + ;; TODO(core-updates): Use 'native-inputs' unconditionally + (lambda* (#:key ,@(if (%current-target-system) + '(native-inputs) + '()) + inputs #:allow-other-keys) (with-directory-excursion "doc" (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.5/") - (string-append (assoc-ref inputs "docbook-xml") + (string-append (assoc-ref ,(if (%current-target-system) + '(or native-inputs inputs) + 'inputs) "docbook-xml") "/xml/dtd/docbook/")) (("http://www.oasis-open.org/docbook/xml/4\\.2/") - (string-append (assoc-ref inputs "docbook-xml-4.2") + (string-append (assoc-ref ,(if (%current-target-system) + '(or native-inputs inputs) + 'inputs) "docbook-xml-4.2") "/xml/dtd/docbook/")))) #t)) (add-after 'install 'move-doc -- 2.33.0