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 iO/DChHnVGFTFQAAgWs5BA (envelope-from ) for ; Thu, 30 Sep 2021 00:22:09 +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 CIuOBhHnVGHIDQAA1q6Kng (envelope-from ) for ; Wed, 29 Sep 2021 22:22:09 +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 D92A9DF8C for ; Thu, 30 Sep 2021 00:22:08 +0200 (CEST) Received: from localhost ([::1]:45826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxn-0000FY-UQ for larch@yhetil.org; Wed, 29 Sep 2021 18:22:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwr-0006ti-Fa for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39187) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwr-000258-6q for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwr-0000kT-2g for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 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: Wed, 29 Sep 2021 22:21: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: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540312567 (code B ref 50905); Wed, 29 Sep 2021 22:21:09 +0000 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:31 +0000 Received: from localhost ([127.0.0.1]:50681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwE-0000fE-Qh for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:31 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvf-0000YW-P5 for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:57 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKvRx; Thu, 30 Sep 2021 00:19:55 +0200 From: Maxime Devos Date: Thu, 30 Sep 2021 00:19:25 +0200 Message-Id: <20210929221938.17168-25-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-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=1632953995; bh=A/vKhXVf1Ixg8MY6muVmQzAsOO348cwUUuDUpPpNf1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PFupcMYc9BwBolypOECkXRloCAHfcLdjCnoKSWtL8dxChQ+iq38nbKPx+/Dru3AGF JEkZeanUWam6NKC0cH+pdc+63+H+2QoFPnoLYFf1izLqq9WXuk0HMiTXEgVlU+qYvq n/b8bVyrhmPl/Gdm/GAtDyF+hyQQLM8+VeyN7l/L3L2F+lteCOjLkksgdDJ7N89mHe 4SCHCzYVSHd58xc0Nf/6cmsDBU0hOcmzfpH/82WvdB9alCwd35zsaj4tFIm5FVDf4N 0Qi+D25ceEK/6eJ13rFLeXQ3heQon/YBydcFO8AjlbNfy55bJe7O6rOOtaSgXuXcgi 9HAQalgyeQK4A== 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=1632954128; 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=Qxbq2IPAX4yUi9JZx4lVD7xPU8mw9K1zkFirK3Imqgq8rxTPy3bkU3mlvYohJkKXVOgcK0 jrfpOoOZLB8eRoukOFkWBdKLfufxEPefgF3znvBrfqsBI3YEvSmkM1Pdt40J+qhnRWAQ3A PGUI1WUMUFRUgZ2UglahEhzau4/UgQEgUP+nyhv0FLrPTPUSPg6v9p2r1uO4nU28kgME7A xOU55rYLGnoE0GrKAUAXojIhAdQAX14Q42yNT4BvVhZln2ZB4GD7YcKseb/vxXbl+nZW+v lxLJd/5wJ14bomBkWMCTNR1f5Qy2xL8ipFKsdM9pmrGG2j5bruQsnrEz8sMBIA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632954128; a=rsa-sha256; cv=none; b=Xi3vR0MH8hDdRSeGh6xbNhhYwH/mTz6AtNZ5+jwJOCPmYvIqGqp5muc/avRWLUS6IOGpLk 5ozx7e8doZ1gpFJoZabAfjuv/V9P8SlHggYlvwIRapzo5ZuOM4qA4aCJO4UDj7EqNlXDtE OgK0qNhjcLYQS3IlvOvhAt9+YPTCMBYQ7fOJkGpm9FD3JmomlMw/BMfh9NF+2LjoDm9OzP Xmx50WZ2GuQUB/D779o62d3MfhqonNA8ceYT/S2YS42xOL6fHmcYd82jJdzoXI+34BtVt/ DSWgxpWnpTo/en/C1ZJVTguztAEKAot42kl6fJrL3sQwg3EaWw8dmsI02ZquHQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=PFupcMYc; 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.20 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=PFupcMYc; 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: D92A9DF8C X-Spam-Score: 3.20 X-Migadu-Scanner: scn1.migadu.com X-TUID: DBwUsQe18hK7 * 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