From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id hwwDISsbV2G/FQAAgWs5BA (envelope-from ) for ; Fri, 01 Oct 2021 16:28:59 +0200 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id UET/GysbV2ElRwAAbx9fmQ (envelope-from ) for ; Fri, 01 Oct 2021 14:28:59 +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 3D1BE29835 for ; Fri, 1 Oct 2021 16:28:59 +0200 (CEST) Received: from localhost ([::1]:49306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJX0-0006DL-6b for larch@yhetil.org; Fri, 01 Oct 2021 10:28:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUJ-0002Am-Vv for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUI-0000Zq-Lz 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 1mWJUI-0005iH-IB for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 25/38] gnu: at-spi2-core: 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:10 +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.163309831721702 (code B ref 50905); Fri, 01 Oct 2021 14:26:10 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:17 +0000 Received: from localhost ([127.0.0.1]:56939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTQ-0005ds-O6 for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Td-I6 for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:54 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqMH; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:27 +0200 Message-Id: <20211001142140.17027-25-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=1633098110; bh=A/vKhXVf1Ixg8MY6muVmQzAsOO348cwUUuDUpPpNf1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=e6JCYD1sQ/eSMVmzxoZohTjbArDj5PsKSsfJW8l6ZmYWXh0IiJ4TwX+dVPA2rLdEj ZZ90ZHqlbtIl4+/D4gQYNVORmxNK+7nkq+MYg6lPb2qAvSl6FVUXm7XuSqRmdQVVp2 /mNlqzaBtkd1zO6AgruOjMXyPnFFtoSbBZhm+VeFWARGi+Q8VCbo3eddMbx6MsnwEd OUWRK83a4+1K3MIe+szUI83ZZBCxngYiqrZAqt/QYaJlCVfXiP6OqDg4lg95MTMNcj L6ddt2CAQB8WKaRgJuWEOXhvHKkwKsE2Cajg1Qp5u/PL+jsRZ6EnCcmNE4EEgwtIvC dCNN97BBk9htw== 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=1633098539; 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=A/vKhXVf1Ixg8MY6muVmQzAsOO348cwUUuDUpPpNf1Q=; b=Eht3CpAyBoz5f0pLBroempq8+s/4Jj7Obt+r6UzZ1sI60fc5yGZwB425nOWBMs8IhcLtak Y/oaTQXrs/9Hzj9CAUe1vaYfI6MPGn4j8NJvkLhr+TOIejkLA5Vl4AKhQvaUJeDFAc9B3I gBfI1Smlv/yClHKPmbOwKfSUkGuoMp88fzScUeMYS37t8cpxgI0HEl2ohXWXcpkgkIBU8R Btt+iynNiRKg21RWuosyYDzLFdnxQuPktMOaNxI5S6nUIKU4ZAxV1166n/j8J/cVfOb8Nw xWjbobiCDGKLpRY7SfoTZi7dleVN5eTBmB39Ri35G4IaYoz3JmTm0WZ+2fV87g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633098539; a=rsa-sha256; cv=none; b=dcyKyQcxLAzgjc3VMLHOAbRQFKCEAruelDlWoHYtcJpHT0mBqWCDeevlFLvGPeD//3kX5T XF7sFXDtIHc9/ZJR7FgwkAkKVA25686LC+028NOZAkXPEZYii2EkISvdnJeZVciCRwI7zi oszXjSzy5AW7R+YycjVoGr7c+F/Rdsw9s2KcWrSXZdKsBQ5GWQKL0Fz0IsGi5LFWNcRRZ2 oGXhaYmoIXYyoVs/YunyAkQgfRmo0WJ8cHrQP93VWGSGLSvf3MF8jthOe5qC9S8TmzD8FD rCJ7qGA4NhsvM8IsxkOfNU3LvXr6vOoOPUV0MXbCZKwtrXCiYoBvEUwmgdKcFQ== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=e6JCYD1s; 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-Spam-Score: 3.70 Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=e6JCYD1s; 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: 3D1BE29835 X-Spam-Score: 3.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: 5QqsgOvtD47G * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>{patch-docbook-sgml}: Unconditionally look in (or native-inputs inputs) for docbook-xml. --- gnu/packages/gtk.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d829218305..634a0125d8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -740,15 +740,10 @@ 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 ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (let* ((xmldoc - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) + (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") "/xml/dtd/docbook"))) (substitute* "doc/libatspi/libatspi-docs.sgml" -- 2.33.0