From patchwork Wed Aug 25 18:03:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32291 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 F23FF27BBE3; Wed, 25 Aug 2021 19:10:11 +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 C3E3A27BBE1 for ; Wed, 25 Aug 2021 19:10:11 +0100 (BST) Received: from localhost ([::1]:36820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxLm-00062o-RQ for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:10:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxLe-000629-Lo for guix-patches@gnu.org; Wed, 25 Aug 2021 14:10:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36265) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxLe-0005CY-E7 for guix-patches@gnu.org; Wed, 25 Aug 2021 14:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxLe-00034I-6n for guix-patches@gnu.org; Wed, 25 Aug 2021 14:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 33/52] gnu: libthai: Add datrie as native-input when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:10:02 +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.162991497611726 (code B ref 50201); Wed, 25 Aug 2021 18:10:02 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:09:36 +0000 Received: from localhost ([127.0.0.1]:47803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxLE-000332-MS for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:09:36 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:52096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxLC-00032W-9S for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:09:35 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4Gvv430VrwzMqhJM for <50201@debbugs.gnu.org>; Wed, 25 Aug 2021 20:03:47 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3k2500G0mfAB401u3m9G; Wed, 25 Aug 2021 20:03:46 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:13 +0200 Message-Id: <20210825180332.5720-33-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=1KOrMpUxymccNn0C6g1JfavoyYMU1+DPnAs0QaHWtyk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Yz6iZ25NswdiHA7LOBvWorXuWaaMcv8JD+RWejAdQ3TrR5xJi5cgDj5J4c2pIeXIa VnP+pZok2+thM31Pg4jP6kVqKgJHxq05W5VNE7mQg9B42nCS4cbINoqzkGyCm7X777 Xcs3OmfjKs8IrKm8XZlPdNhPwD1bL66SzKUEUiqmSiW8gw3NzBX25JI8aGdRi2PZTV IOM9SnySOMD1YZGZS7veKvqRSyz40+L/2C/wTSoLsVPf7jPvqHpPWuKM0H15dp/J6o B3y3yik00BYBSDTQHZMFwjGZpfIKqzYRiirpevQVnYbTAI62bgb8UIdsB/+VtAfhS2 Umkreh/G4Tu7g== 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 This allows the cross-build to succeed. * gnu/packages/gnome.scm (libthai)[native-inputs]: Add "datrie" when cross-compiling. --- gnu/packages/gtk.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cd764da7f3..48abbdcd77 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -328,7 +328,11 @@ representing trie. Trie is a kind of digital search tree.") "/share/doc/libthai/html")))) (native-inputs `(("doxygen" ,doxygen) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ;; TODO(core-updates): Make this input unconditional. + ,@(if (%current-target-system) + `(("datrie" ,libdatrie)) ; for 'trietool' + '()))) (propagated-inputs `(("datrie" ,libdatrie))) (synopsis "Thai language support library")