From patchwork Fri Jun 18 17:16:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30433 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 47BA127BC81; Fri, 18 Jun 2021 18:22:16 +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_H4,RCVD_IN_MSPIKE_WL, 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 0C32827BC78 for ; Fri, 18 Jun 2021 18:22:16 +0100 (BST) Received: from localhost ([::1]:53616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIC7-0002Nq-2i for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAD-00088K-6C for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46571) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAC-0004JN-TL for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAC-0004vD-Pz for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 31/37] glib: Look up "tzdata" in 'native-inputs', not 'inputs'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403679518626 (code B ref 49025); Fri, 18 Jun 2021 17:20:16 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:55 +0000 Received: from localhost ([127.0.0.1]:58074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9r-0004qG-9C for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:55 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9G-0004j5-1Y for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:18 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKHe5; Fri, 18 Jun 2021 19:19:17 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:25 +0200 Message-Id: <20210618171631.20534-31-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036757; bh=vxnBAG50YIH3F0oavVB7X2j23R02j34MPE0qrGyVBi0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=jKRzehJ2Dx/wqEPd+m+IP8cs232BHOJdLi/iEVbFk63pe+gkb08axKPsfVgDhQhRK +RT497AwI5JKfsKjyGM1chneHS6qrGkI43okgq4J/keBe3vpdIoaNRqB4MStYjaTSh ytqY5eTZ/HTMPOR7ZVUgF6wJR8sDA4b0GgWS47vByDho8PuckcItnHA+KZAu62rOwU p/myme3nzKa+8hassYKd6dx95hXE4vmOkkdZaRdf/B0YHwWpParPaiqioIvUf3i9r7 AMbA4OzYKYqLh2+epPjWhEPVlzcQSKl/G9XU4EgBoizBE10AWKyY45tQmhCb74+gSX HSB1nUkR+loTA== 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: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Otherwise, "tzdata" won't be found when cross-compiling and string-append will complain about types. Alternatively, "tzdata" could be moved from 'native-inputs' to 'inputs'. * gnu/packages/glib.scm (glib)[arguments]<#:phases>{pre-check}: Look up "tzdata" in 'native-inputs', not 'inputs'. --- gnu/packages/glib.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 244544ea6f..57e8282a89 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -251,10 +251,11 @@ shared NFS home directories.") (package-version python))))) #t)) (add-before 'check 'pre-check - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") + (string-append (assoc-ref (or native-inputs inputs) + "tzdata") "/share/zoneinfo")) ;; Some tests want write access there. (setenv "HOME" (getcwd))