From patchwork Mon Jun 14 15:39:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30266 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 944EF27BC81; Mon, 14 Jun 2021 17:02:25 +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 5B3E727BC78 for ; Mon, 14 Jun 2021 17:02:25 +0100 (BST) Received: from localhost ([::1]:41428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp2e-0002yk-6z for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:02:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsoh2-0006pj-FY for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36110) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsoh2-0008Lt-6r for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsoh2-0004Ms-4x for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH 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: Mon, 14 Jun 2021 15:40:04 +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 Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368517216710 (code B ref 49025); Mon, 14 Jun 2021 15:40:04 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:39:32 +0000 Received: from localhost ([127.0.0.1]:47648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogW-0004LS-6r for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:32 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:49724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogU-0004Kz-Oe for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:31 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3fW250050mfAB4013fWkZ; Mon, 14 Jun 2021 17:39:30 +0200 Message-ID: <79799f427dfcc7e916a033e1920d0eeffe5c1f0c.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:39:30 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685170; bh=21pHze+pHX1QUU3faZDVeyKHR5BWcrUM+up16DXtFFQ=; h=Subject:From:To:Date:In-Reply-To:References; b=oMebheRORtPQHAXtLGjqTa4FPg6o3Xddy5r+StsFo7OFQWzrE2rT7ZcRsuzIWV+bF ffoslRR9DrvVo3kRUoRHoWPIMgpYQLzXRqYMUT6LevQx2Sj1YQ7TLpz5Dv37a9mmQy XNVhHIQ2BsIFcZapfZSd0z7QHwn/h5G1vJJ3FjoHDjqfqhdZ5dz+UPSePJkfawNQsu Vseq4/tJIwjvGHIYYaihNf1Tfuxlyit1pnJ8qoAOagUWHMiPMbKsXD1haAfFIEvgnn 88rVuRT1Ic69G8Jxy2ieWp8h/5giCOScP1PAqvBrAyI20vHm07r58cGAFxFQitlMzE dXKlO2VQe2DIw== 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 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))