From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KKLEAqAgV2GkIQAAgWs5BA (envelope-from ) for ; Fri, 01 Oct 2021 16:52:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id mAHmOZ8gV2E+JwAA1q6Kng (envelope-from ) for ; Fri, 01 Oct 2021 14:52:15 +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 752551BE8C for ; Fri, 1 Oct 2021 16:52:15 +0200 (CEST) Received: from localhost ([::1]:54882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJaC-0001mC-Qq for larch@yhetil.org; Fri, 01 Oct 2021 10:32:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJa0-0001l6-0w for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJZz-000640-OV for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJZz-0005wH-Lx for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 30/38] gnu: wayland: 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:32:03 +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.163309869922775 (code B ref 50905); Fri, 01 Oct 2021 14:32:03 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:31:39 +0000 Received: from localhost ([127.0.0.1]:57044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZa-0005vC-T6 for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:39 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:39112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZW-0005uU-Nr for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:35 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4HLXNv05g3zMqkG2 for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:51 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqMe; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:32 +0200 Message-Id: <20211001142140.17027-30-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=1633098111; bh=bW0Vj0kgmMa3iTcQKOmwUtI5MJrCmDnhfcB3/zQzyWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=T6OFIN45GZv0Yvq/d00fXnK3nJH7EilKK5lBxsRfFEtRmX2kLbShP1p2pN+gGuFjr g32nXUoYqnkvI+iIiN3vCt6bLh77Yo2L46GcuuzcaXONwxgyuyKK9f8vi0gS+/h4Cg mKePHXwPWnpO641qJ9mckD1QgF5VzY2o92pRZQ9P5TbvAM8hQRriRdnmQOvz3BG2cA WN+n9SoW1tChbNCWX+yI1caDIeH6mAbdtM8AnpiA5AfyVEdAk3JSyCscP/1/BU+XNH Zm4r+TNXygaUPEMp/Uq+1ohjUsFM2e7G8WWgIjoVPTKfHXn8oYseUZEv55p6ijl/Ug rX4lndB4SXxUw== 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=1633099935; 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=bW0Vj0kgmMa3iTcQKOmwUtI5MJrCmDnhfcB3/zQzyWU=; b=gkOO63oxwkJOe/iq8DX5GGoXi/lL44WymidpJjaIGZ3k3a0xmqlsIjUHrAG/9bdSrVvk9j 7BdLilCyIvQOZ1Ao25xctMx9BhLmBFGcgZF00IMpVucvPNzGNZ9shR2Ucz9Umz+yFKe6GM yqzmK6BkIwWzhTmLSAIF+SSb7Ls1E5ejaJ1yrYhDCGQahKKOQqabyddqQ6gR1byc2b9sI9 0I3jrKBPczC4ZElr3vKt6GOv5Dnl1NipkbRE2Dfqx9TSX30+EhubAVDaPG1w2B3zUiWc+r u8scNHvly5xAO5xiPZAmskOSpULySXlyoeclUCSEIVS2bIv1O5tODGTMpjCmhg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633099935; a=rsa-sha256; cv=none; b=OI2lYBK6vATSORV9RzGm545Clbm03pV9J+eaYHxfZKIXaqxWU1Xyc6bR6Hw/Qznl3WqlVH 5LEkYcFMWoZ7fPMSaJDKb6fu4ER+X3W5Vt3ZR40gJYwtfJDbNF7I43eIdqsRNQmwE+ly5S h3+KiWjOXKS6zHgepH3m5260ijtK6Zb6hwSo1wgK/d7DTcRzqBmwRtpgPdqLxUfWgsIy8h u/3j8qloLhj/UoBdsmPOTmngZ5LA0nyRtM6aN4ldozIrHIj37QizJZxqA/oCHV89uH7ZvI uajXEOu+kZ+vwR3fojK/CvX0TRsh1anzowB8knRQhWI+euj1p2RFlPBaqhxkiw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=T6OFIN45; 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.70 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=T6OFIN45; 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: 752551BE8C X-Spam-Score: 3.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: VuY5aaCopUm1 * gnu/packages/freedesktop.scm (wayland)[arguments]<#:phases>{patch-docbook-sgml}: Unconditionally look in (or native-inputs inputs) for docbook-xml and docbook-xml-4.2. --- gnu/packages/freedesktop.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9bcf2d8d3e..0f04a38c00 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -975,22 +975,16 @@ Python.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook-xml - ;; TODO(core-updates): Use 'native-inputs' unconditionally - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs #:allow-other-keys) + (lambda* (#:key 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 ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") "/xml/dtd/docbook/")) (("http://www.oasis-open.org/docbook/xml/4\\.2/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml-4.2") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml-4.2") "/xml/dtd/docbook/")))) #t)) (add-after 'install 'move-doc -- 2.33.0