From patchwork Wed Aug 25 18:03:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32277 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B2D6927BBE4; Wed, 25 Aug 2021 19:06:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0927427BBE1 for ; Wed, 25 Aug 2021 19:06:12 +0100 (BST) Received: from localhost ([::1]:33438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxHv-0003bG-57 for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:06:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxHm-0003Yo-EZ for guix-patches@gnu.org; Wed, 25 Aug 2021 14:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36232) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxHm-0002Qj-6k for guix-patches@gnu.org; Wed, 25 Aug 2021 14:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxHm-0002vs-1Q for guix-patches@gnu.org; Wed, 25 Aug 2021 14:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 30/52] gnu: json-glib: Find docbook inputs when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991471011060 (code B ref 50201); Wed, 25 Aug 2021 18:06:01 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:05:10 +0000 Received: from localhost ([127.0.0.1]:47753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxGs-0002s8-AN for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:05:10 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:55696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFb-0002i2-3t for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:49 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3k2500G0mfAB401u3m99; Wed, 25 Aug 2021 20:03:46 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:10 +0200 Message-Id: <20210825180332.5720-30-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914626; bh=Fj+ZeD8eV6Cbp/J5oOj7GdiqcG6cRD09wpUoBEplGCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TFrwX/gks4ClCJ3/MELcTb5m04UnGnyu4SGxsTYphP/igPCYyM+UJ4qYW4jgkSoVy Az+fJaJf2IU15O4be5nDaGU1ADJDy4C6cKQVo5ZEiiel33ahJMAU8XggUd45wUW7DY RWTYNOmlmdmPbjnXy8NUrJwdH5snTSSLLIW7XD7WQO8zoZM2gKHKztIrL6hQ4jc3ex OHbuQ0ZEVB3qb/i8L8sMKLhPhzuGlCWnlXoZ4TgQiCjq3W3hbWzJv24Mkgt3gBdH3S tEVsuK52REkQ+WCxVII2iFrZP0Mf5PbEPOQicOvXUGSMeWzQWoVI47FJMkcwWatzqZ ibTDMcCMK2jPQ== 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (json-glib)[arguments]<#:phases>{patch-docbook}: Look up "docbook-xml" in 'native-inputs', not 'inputs', when cross-compiling. --- gnu/packages/gnome.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f0f3c0aeef..c0b6d010c7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4581,15 +4581,24 @@ configuration storage systems.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - (lambda* (#:key inputs #:allow-other-keys) + ;; TODO(core-updates): Use (or native-inputs inputs) + ;; unconditionally. + (lambda* (#:key ,@(if (%current-target-system) + '(native-inputs) + '()) inputs #:allow-other-keys) (with-directory-excursion "doc" (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (string-append (assoc-ref inputs "docbook-xml") + (string-append (assoc-ref ,(if (%current-target-system) + '(or native-inputs inputs) + 'inputs) + "docbook-xml") "/xml/dtd/docbook/"))) (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref inputs "docbook-xsl") + (string-append (assoc-ref ,(if (%current-target-system) + '(or native-inputs inputs) + 'inputs) "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/")))) #t)) (add-after 'install 'move-docs