From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CP1hNL6HJmEbnAAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:11:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id aAMjML6HJmGmKAAA1q6Kng (envelope-from ) for ; Wed, 25 Aug 2021 18:11:10 +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 92D3A384E for ; Wed, 25 Aug 2021 20:11:10 +0200 (CEST) Received: from localhost ([::1]:37994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxMj-0006wA-Ki for larch@yhetil.org; Wed, 25 Aug 2021 14:11:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxMd-0006s2-Co for guix-patches@gnu.org; Wed, 25 Aug 2021 14:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36292) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxMd-0005xu-5z for guix-patches@gnu.org; Wed, 25 Aug 2021 14:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxMd-00037a-1K for guix-patches@gnu.org; Wed, 25 Aug 2021 14:11:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 49/52] gnu: gdk-pixbuf: 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:11: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.162991504011940 (code B ref 50201); Wed, 25 Aug 2021 18:11:02 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:10:40 +0000 Received: from localhost ([127.0.0.1]:47832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxMG-00036Q-GN for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:10:40 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:38026) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxME-00035m-Qq for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:10:39 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4Gvv451Jc8zMr2T7 for <50201@debbugs.gnu.org>; Wed, 25 Aug 2021 20:03:49 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3n2500L0mfAB401u3o9v; Wed, 25 Aug 2021 20:03:48 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:29 +0200 Message-Id: <20210825180332.5720-49-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=1629914629; bh=vYlwZ4JViL0w8VaU3tpAulUNlmmOu4afIBBTKxWC0+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=G8J+vBDz5rI0n6QrBAjuNugmx//14DJ5IBiBrEM+HCtK/GfPutduNCuxYSiwlHRXV 93pNU4k7MDk3AWz9CDVZvz6tow6U0xNeZayNTUuHHZxjgwW/74fmOAr6hF87sJH3Ce pWNBlFiUpghfB/wcaCPDxK7leMAoP9AkpIbe4Cf+ggZ6bizXVAP7PsYMtA6NgtOiL7 yOfpcdqzF06DJmypUrBXjMnXnzVcv7Ko2XJUw3I/fcktTJYW4WG4heAscao5FEmOMC WVZTKXQBpWVepUP/6yFoGlGnKzjQ3/W0qHs/LyQ7EEkoY5NZXWqosd3yX6vfbKFfiF Czdw5+bKS6YYA== 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=1629915070; 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=vYlwZ4JViL0w8VaU3tpAulUNlmmOu4afIBBTKxWC0+0=; b=NgLOrIXxkSGVgcWmpFIg/UBbGrBNBVgQjZVemmDzzECFa5koMTfis6Kfc97l62DaUkiHYj u5uB6FIN4e+ObQUwtmXnaP3o6EAw7ORLb6AKPFzOXRmsPu4wnS0flDgRW7zt3Sk5xSwM74 lq1VDlAlFZWs2o9Tvult8Xt/WxHE39+IUyetJ/8aOQekE/yuim+dbI/zCPIgVeccUNjAEW vYW0MypoPzIxwX3L+qGNsAFBP4riWBAy7NtJ9bAmG2in8k5ypUVAy6UU9a+9mJcwbtN82J 21LODLIca3hg/2cPAXtivSnJwga61iNwv9suDfNa8SofZePXaoHi/RDE+o93Mw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629915070; a=rsa-sha256; cv=none; b=tHqAFWSJoLhW8+Ctffu6dtiN5KI92mIH8kl2CVgYH09Jb0kWUrZIVLUNiEzCu/bYE97g7N Kh1mzsafrGtnnECBH+0f9XDvaT1D80SLN4MGXM9toLv4mECPGqIvZSOFP8YEKx1sn+fIUB n4edJGEPXklLjr7ud6/DvY4WrdMxlTk7EgFfeL0LTLBBONiVLDGMTfVmoN6b5jIvkUmC+B rIpXM4DoitJPjp1nAg/gjiG9KzRAGylw1xt5DmCCB6kcoLi03OG26y3KG7kfPS8bI96vKT P5ov/RIaj1x4E78DX6zXeCtrf2yrrh4Y8IEggKa+4YJbul/lUqi4WhryNok2iw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=G8J+vBDz; 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=G8J+vBDz; 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: 92D3A384E X-Spam-Score: 3.68 X-Migadu-Scanner: scn0.migadu.com X-TUID: hKo5oazQYGUv * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}: Look for docbook in 'native-inputs' instead of 'inputs' when cross-compiling. --- gnu/packages/gtk.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1d6be00e60..8bf55ccf14 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -628,15 +628,23 @@ highlighting and other features typical of a source code editor.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - (lambda* (#:key inputs #:allow-other-keys) + ;; TODO(core-updates): Unconditionally look in (or native-inputs inputs) + (lambda* (#:key ,@(if (%current-target-system) + '(native-inputs) + '()) + inputs #:allow-other-keys) (with-directory-excursion "docs" (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref inputs "docbook-xsl") + (string-append (assoc-ref ,(if (%current-target-system) + '(or native-inputs inputs) + 'inputs) "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/"))) (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (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/")))) #t)) (add-before 'configure 'disable-failing-tests -- 2.33.0