From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:e8e3::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gNDnDS4bV2G/FQAAgWs5BA (envelope-from ) for ; Fri, 01 Oct 2021 16:29:02 +0200 Received: from aspmx2.migadu.com ([2001:41d0:2:e8e3::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id iPeeCS4bV2G+EgAA1q6Kng (envelope-from ) for ; Fri, 01 Oct 2021 14:29:02 +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 aspmx2.migadu.com (Postfix) with ESMTPS id 056A54A751 for ; Fri, 1 Oct 2021 14:29:01 +0000 (UTC) Received: from localhost ([::1]:49446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJX2-0006JU-UE for larch@yhetil.org; Fri, 01 Oct 2021 10:29:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUK-0002Ao-0J for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45426) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUH-0000ZT-Dh 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 1mWJUH-0005hv-Ah for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 18/38] gnu: gdk-pixbuf: 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:09 +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.163309831621681 (code B ref 50905); Fri, 01 Oct 2021 14:26:09 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:16 +0000 Received: from localhost ([127.0.0.1]:56933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTQ-0005dW-0c for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Tt-0L for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:53 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpLl; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:20 +0200 Message-Id: <20211001142140.17027-18-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 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=F2lxH8w2Q2islWBG4l7ocoP+OtDE0r33U+tqgDhoqvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UMW+88zo9NAoaNlclAlMUmKdVPG+4c2emyuiGJkGMP09DRpWzNXeVXmM3y3DSKKga /F5ilVg3PXjj2NxN1koDtDX8ovxkoFRYwh0Yzq68jMMhbsO9gYw2rPrUSue6otmCO4 6bGBhJE7xEoGEM+PaiDPoqPhOVixS8uvZqC1kSUogn1XXkdU4a5TJ8D+sI2vbCKZwR IYqNu/6f8ufsSbgr1xJ71mLRxQLxBjkJSzzdNofpaLwox6GxdGFsm/uLStQrO0ggiq QWd2Jp3BOHvuCUC/a++EslazRosXnpL8cmxAT2r/WlRJRs4km8VkQMs8Y9Kl/WywzI p/RFFT5OcBAxw== 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=1633098542; 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=F2lxH8w2Q2islWBG4l7ocoP+OtDE0r33U+tqgDhoqvk=; b=tZeeC/rwbdEoRoqIk4EjMfLJm6MgXOq9uXD6J1b7hmOcmrkYOdiZCSCJ1+28R5bLW5nhCD jgLakNsdoiZttfejaDGcR1retE0Q2Hcn3j4IKFKVYoOI5thcYFgcnbM22g5Vo8MEQf2yNX robn5VlZ+LWYewgi5Y3F6Q3yXWrE1i7IiOb7R9xtGVMelx1H+wM9IleIAR9UQ3p919nAeO zyWU20Nykyxmlcbz3qALw+xfxhEf4RFyReqRhM8QHPucpSwY4Gl2ikwXPr3TTjALXpnss+ Dnp86b/3tmsoElFs85eS6kmYeSbI/8nhwTvM4Sw9I2mxzxIUoOB/3A6XUP+25Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633098542; a=rsa-sha256; cv=none; b=LoLNRtjJgq9cGf7+CvYFbT0BDhyu03c1J4ef1olo6/OPTjyAc/njLAArqe6NRxQZ9IGVRR i5oXWiZGXpNQK170ZutNpysw67y3JkfYJO1tuLRNCmS662FMq6Byb/Lm9jKcdC8eoRT+kC jUwWTUtCSJmSWALMXWpYDafThxN1iCWaWc9d0XChCpIWyxyoVmGffI6n/r9jiV8fIJtBIh vy2hQMVqhXsK5cDta54feUVWhJT5pWiEyPxv+sDXnYohrbGh0P/bFe+jh3FhAdoMI6Psnf IdadxGTgQJwR2btqBxQ0w3PyyTFUQXm6FqsPnqVaQu2x/CN0pde8a36DLQjOCQ== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=UMW+88zo; spf=pass (aspmx2.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.70 Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=UMW+88zo; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx2.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: 056A54A751 X-Spam-Score: 3.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: OkKfdRdgeS1g * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}: Unconditionally look in (or native-inputs inputs) for docbook-xsl and docbook-xml. --- gnu/packages/gtk.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4f8b87ea48..fd7feab69b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -623,23 +623,17 @@ highlighting and other features typical of a source code editor.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Unconditionally look in (or native-inputs inputs) - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "docs" (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") + (string-append (assoc-ref (or native-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 ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") "/xml/dtd/docbook/")))) #t)) (add-before 'configure 'disable-failing-tests -- 2.33.0