From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mK6kGaYIzmAXEgEAgWs5BA (envelope-from ) for ; Sat, 19 Jun 2021 17:09:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id kPVkFaYIzmBWeQAA1q6Kng (envelope-from ) for ; Sat, 19 Jun 2021 15:09:26 +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 23FE52062E for ; Sat, 19 Jun 2021 17:09:26 +0200 (CEST) Received: from localhost ([::1]:58414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucb7-0005DP-6H for larch@yhetil.org; Sat, 19 Jun 2021 11:09:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081y-LH for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48900) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY4-0007z3-Ac for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY4-0005hW-6d for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 31/36] 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: Sat, 19 Jun 2021 15:06: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.162411516321662 (code B ref 49025); Sat, 19 Jun 2021 15:06:16 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:03 +0000 Received: from localhost ([127.0.0.1]:60405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXq-0005d8-Fo for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:02 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:60288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX7-0005Xc-Vn for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:20 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4G6fH14Py2zMqsJV for <49025@debbugs.gnu.org>; Sat, 19 Jun 2021 17:05:17 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135HrH; Sat, 19 Jun 2021 17:05:17 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:53 +0200 Message-Id: <20210619150458.12057-32-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-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=1624115117; bh=4s6okA0SLtxXEfxoNWtCT6YolV4q3Ygrpt5ogdXO6uU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IQ14UvL/FU4P7BddWkyq+id1SFpYkXnAOVAjGfwncZiN9Cd5jKbPvDAM3rlhyAvjd irtloZlwejMZ703d/4uboEHuW3m6+LaMv5B77SkEiqUbwBX+Q8J4wuGgt3IN745KYb QjhpbRYBhe2USGP8ICRcFd5sxaJbBbLw1aH6h/J1/5bXb5YgNf70S3M9IcrFwUFfC/ 5lDIBbo2LWO2CM/Rn5+4zP1+K0mB9b9kln+NOCupU2pyCgVw7up64xY9DVaZP8Hm/5 AqNsm2zuW5K1p2yin1hc2miW/iUrIe2flw0G7JFUaX8GnS6z2nmlCcrBCM69EuysAd 32hIpbVeYDwTw== 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=1624115366; 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=4s6okA0SLtxXEfxoNWtCT6YolV4q3Ygrpt5ogdXO6uU=; b=Sbdj18ywbNzuVQd8F2oldKRDS7ZrFsS4i+kbUlZj4fK0K7bols0wXIArCdNT662yNVOchJ 1QKFVpF5l1d7j/2c2EWYFT0xHnhbb7ZIw7FgIfmtB3vPiHRebxNsnQ7JNsMigJexQ9uVMh r6Cj3yhJLhYrwln34wrrkKBbZqW4X3rHVgVs8DOsxji/ErD/du23OtVc24ZkLkEAAhH5i5 kvjT7iCI+KgltdLjN9nIevbi6taatzocXEdylVEvhLibEzG+BCS1PdXJBoF/15RzNigVgR ZnjC4AIB/kEX5HXaqQFNASARQSv1UirJopnFQuy2XWKcJYsvmW6ZOQSdf/1uJA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624115366; a=rsa-sha256; cv=none; b=hclaZjjZ0KUP5KcdME/Wuw1/C4QXDVyGeVZefdPwPHyc/wnMFbkV+k9hy6q0e2zuVOaeh3 TM+g2qj7+oHqTdPDjKgYrijqQ0PnU1qarUBTiOVW02vgTaC20Butxu74u/70t5dGQ6EsdF T7wdJorwoPJ+EnTD5pt0I49tqKeyBMymImLiiIR3Vu/RwAIKQtXw+3/BVbCLqD9AIj3eum q2Ifq4mqeW0Jy+A4JsHQPLgKkKd7SUbzFYbiK4HX/eAoShI7bTkRSnKP+jOdGoWWD4T1Hu wwpla+85CtLi+6oywBWFTWa+EaQseoQUdqaiPfBHdhFTMjma2PSa09mqNGF88Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="IQ14UvL/"; 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.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="IQ14UvL/"; 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: 23FE52062E X-Spam-Score: 3.68 X-Migadu-Scanner: scn1.migadu.com X-TUID: XL37I6YN6J2o 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 22bd384fa7..d3879879de 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -252,10 +252,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)) -- 2.32.0