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 iLRGHSys8WAEQwEAgWs5BA (envelope-from ) for ; Fri, 16 Jul 2021 17:56:28 +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 gJwBGSys8WDTYgAA1q6Kng (envelope-from ) for ; Fri, 16 Jul 2021 15:56:28 +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 3268B5BDF for ; Fri, 16 Jul 2021 17:56:28 +0200 (CEST) Received: from localhost ([::1]:37792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4QCR-00047m-7x for larch@yhetil.org; Fri, 16 Jul 2021 11:56:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4QC3-0003oS-Qn for guix-patches@gnu.org; Fri, 16 Jul 2021 11:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4QC3-0006aI-Jl for guix-patches@gnu.org; Fri, 16 Jul 2021 11:56:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m4QC3-00035h-Hu for guix-patches@gnu.org; Fri, 16 Jul 2021 11:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49597] [PATCH core-updates 09/15] gnu: Use 'search-input-directory' for glibc locale data. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Jul 2021 15:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49597@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 49597-submit@debbugs.gnu.org id=B49597.162645095911834 (code B ref 49597); Fri, 16 Jul 2021 15:56:03 +0000 Received: (at 49597) by debbugs.gnu.org; 16 Jul 2021 15:55:59 +0000 Received: from localhost ([127.0.0.1]:52162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4QBr-00034W-K8 for submit@debbugs.gnu.org; Fri, 16 Jul 2021 11:55:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4QBp-00033m-7b for 49597@debbugs.gnu.org; Fri, 16 Jul 2021 11:55:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33758) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4QBj-0006Jb-UY; Fri, 16 Jul 2021 11:55:43 -0400 Received: from vpn-0-27.aquilenet.fr ([2a0c:e300:4:27::]:38216 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4QBh-0004IN-26; Fri, 16 Jul 2021 11:55:42 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 16 Jul 2021 17:54:14 +0200 Message-Id: <20210716155420.32447-9-ludo@gnu.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210716155420.32447-1-ludo@gnu.org> References: <20210716155420.32447-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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=1626450988; 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; bh=s281wL0Q3ljkX2IMwCCxLEr3VRD5aVyPPAaMGUBc26w=; b=oyq+Lcbqcr1Dj4Ol7RtnfU+4I5qPGS7ZC+S+hj7/oMX/i4iVUPP4eNrrY4CYOGxzDVLGGK +oZDORlBreP4K2Wb5mDGvHgorA2zdk6wf6IFZzoz57xJHgtVuChhI8GcHhuST0ii/UBIMg zzZNBp+kGePKjJbYgU6S8CJRZiCC5/1d2Hc/lX3udG7ngeMG/0ZnNfNRYm5JB4chUPUiJe 5GUFYayi0YxnnD9iVAv6xcyI08jKz/ZfBBuH4DR82jav0sQNneOc/58J1sMH5ngkk6RFhH /4MZKmPJIrcmZQr5keK3qCbuYXQPoEK6fIFkr6sjKXfHarjv2xDEN4wNB353pw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626450988; a=rsa-sha256; cv=none; b=LlXOEQ5mKZgy1LGUBI/z28Gks7JWj7uLVfGSkCDMeU+JWwRT57HG5f19u78dVuT/HIoqCi LSRnonh32Bx/jDdfgGf4agu/JpKKsc8TAuKW8GbDEvHi1A3DDHU5nfaY3WCQCa4TA4+/ci 8kEY2ahVy+reIqyXUz+fCzvxSu3hOm1cPKqk40jZEli65W4GtyiD2X7GK/a1BbpPJ+trPQ JrIAod7UTSBgU+JjA5DYIrel6acZRIuPfu9HYaMibgHBgOpUZE2iXOInV24ZIcFY/1IgZN j80i3ICLv0oOqyKCXT8fLHtAsh0i+5yyBq6eHB7NUjLGIWc3PHqarwV+5WHUvw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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-Spam-Score: 2.09 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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: 3268B5BDF X-Spam-Score: 2.09 X-Migadu-Scanner: scn0.migadu.com X-TUID: 7vHKH9j9bVPJ * gnu/packages/gnome.scm (gnome-desktop)[arguments]: Use 'search-input-directory' when searching for glibc's "lib/locale". * gnu/packages/gnome.scm (geocode-glib): Likewise. * gnu/packages/package-management.scm (flatpak): Likewise. --- gnu/packages/gnome.scm | 9 +++------ gnu/packages/package-management.scm | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f78c8ae6aa..4f63b6bf38 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2179,9 +2179,8 @@ offline sources, providing a centralized place for managing your contacts.") (system "Xvfb :1 &") (setenv "DISPLAY" ":1") (setenv "GUIX_LOCPATH" - (string-append (assoc-ref inputs "glibc-locales") - "/lib/locale")) - #t))))) + (search-input-directory inputs + "lib/locale"))))))) (native-inputs `(("glib:bin" ,glib "bin") ; for gdbus-codegen ("glibc-locales" ,glibc-locales) ; for tests @@ -5315,9 +5314,7 @@ permission from user.") (add-before 'check 'set-locales (lambda* (#:key inputs #:allow-other-keys) (setenv "GUIX_LOCPATH" - (string-append (assoc-ref inputs "glibc-locales") - "/lib/locale")) - #t))))) + (search-input-directory inputs "lib/locale"))))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums ("glibc-locales" ,glibc-locales) ; for tests diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 4e1543a485..e7dd5dc29f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1393,8 +1393,8 @@ the boot loader configuration.") (add-after 'unpack 'fix-tests (lambda* (#:key inputs #:allow-other-keys) (copy-recursively - (string-append (assoc-ref inputs "glibc-utf8-locales") - "/lib/locale/") "/tmp/locale") + (search-input-directory inputs "lib/locale") + "/tmp/locale") (for-each make-file-writable (find-files "/tmp")) (substitute* "tests/make-test-runtime.sh" (("cp `which.*") "echo guix\n") -- 2.32.0