From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qFAKJUjrVGH2KQAAgWs5BA (envelope-from ) for ; Thu, 30 Sep 2021 00:40:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id iDGyIEjrVGEmTAAAB5/wlQ (envelope-from ) for ; Wed, 29 Sep 2021 22:40:08 +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 DCB24353DA for ; Thu, 30 Sep 2021 00:40:07 +0200 (CEST) Received: from localhost ([::1]:52836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVi0Z-00052u-44 for larch@yhetil.org; Wed, 29 Sep 2021 18:24:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwv-0007AK-67 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39197) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwu-0002CL-UV for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwu-0000le-Qb for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 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: Wed, 29 Sep 2021 22:21:12 +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.16329540342640 (code B ref 50905); Wed, 29 Sep 2021 22:21:12 +0000 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:34 +0000 Received: from localhost ([127.0.0.1]:50701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwI-0000gQ-AY for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:34 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvh-0000ZT-PZ for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:05 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKxSC; Thu, 30 Sep 2021 00:19:57 +0200 From: Maxime Devos Date: Thu, 30 Sep 2021 00:19:30 +0200 Message-Id: <20210929221938.17168-30-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=1632953997; bh=bW0Vj0kgmMa3iTcQKOmwUtI5MJrCmDnhfcB3/zQzyWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Cc9vKcOLGxPP+7kueQTlCq1wve8UqtsELkgkvwRo4B2yE18xTEL7jx/81JCdext8M F5MEGavDHyfTMS/TVVBfxKIlISzbaLAds4DN426q3c/i4O8ampGAp+uZ8paZCG3QUd +lzIWJmUIvT01bo+o4TBk4WPvqCV6XaTJMWXhXGsibzQlD1lywWIxZiaeyKA3xWP2S jmp6mmp4pSZ2gwftM7abUNaJnZWmN6+g1782CHov6AMFb/2bLQCDc0/9bEf/HswHcJ 0Ik7EJun/bMOs5cs+kiXpBX+hr1uaOI8Hi1aB9EG/Ezn2st5bpbuNCbgPLswQTfPBf tGetJMKHPdwWg== 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=1632955207; 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=PpJzo25TeJqEKeSpGc/hNc+ESd/NQbMJKc+xOPjqTGxGlrfO7teRAX7XJ9vsTtnXojznkH 9QPSppLMclYZb9L6iRIQDuOXwPoVDU2viAxHysgmZYZbuhhwL7hZ2/9yBKxf8fyIoKFf6x m61Ho//0fbVPMvjMIUcMSZQO4P3hbK0anBoFCMPS/wjvznpiOudLnPnRhLfJCpG52i5FGB Hjk231O0MCPPcIpWmeGf1cqIDKp6rosjQ1TpS7uDOtutE0Z7NQ4ATYZOeZXaoqEDcmwbJH cvKSHX+J3yWHlAVo8INgDwbsKrH10v3a8xYM0rvxTHDQs0+Yj3Uv8srARLaH5Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632955207; a=rsa-sha256; cv=none; b=so5wFt4gcUINOcBo5OIVjyUgvJ5m72VDVSCmfkMyXks9xCe8+ESPnDLESY9vD5ld0AXeV4 AIM9DvmCUvOqFpP12SFzpMjPpVcDJvOXFjYnlulc2m8Wxcakj+snfhOKdCrIQgs7mtYL6/ ohclOd6jRO99iTqTJIM3MsyuoxpWkI5vLYvU7cuH/MzHe0+gxKRVZapvMpu3L5V53yZLh4 3DgccQOv2cbKkq5UbjrUnQmCeUQ0kJr3SeG2aYGX7CiMIGpuHCYuB8+oZCyWS0DWEYFxQz Q1l4OBxR3mK/JNB2ua83ZAo/VAMiwjcN2sMAIoR33PbtwG17FM3Q5B48qxTz5A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=Cc9vKcOL; 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=Cc9vKcOL; 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: DCB24353DA X-Spam-Score: 3.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: lucyAs4LQ6A8 * 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