From: "Ludovic Courtès" <ludo@gnu.org>
To: 34480@debbugs.gnu.org
Subject: [bug#34480] [PATCH 2/2] gnu: guix: Embed 'glibc-utf8-locales'.
Date: Thu, 14 Feb 2019 23:21:20 +0100 [thread overview]
Message-ID: <20190214222120.10914-2-ludo@gnu.org> (raw)
In-Reply-To: <20190214222120.10914-1-ludo@gnu.org>
This will ensure people who download the binary installation tarball
do not get locale-related warnings, provided they use one of the
selected UTF-8 locales.
* gnu/packages/package-management.scm (guix)[arguments]: In
'wrap-program' phase, set GUIX_LOCPATH.
[inputs]: Add GLIBC-UTF8-LOCALES.
---
gnu/packages/package-management.scm | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index af9667cd91..e283df65f8 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -33,6 +33,7 @@
#:use-module (gnu packages avahi)
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
+ #:use-module (gnu packages base)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages bison)
#:use-module (gnu packages bootstrap) ;for 'bootstrap-guile-origin'
@@ -227,6 +228,7 @@
"guile-bytestructures"))
(ssh (assoc-ref inputs "guile-ssh"))
(gnutls (assoc-ref inputs "gnutls"))
+ (locales (assoc-ref inputs "glibc-utf8-locales"))
(deps (list gcrypt json sqlite gnutls
git bs ssh))
(effective
@@ -245,11 +247,13 @@
"/lib/guile/" effective
"/site-ccache")
(delete #f deps))
- ":")))
+ ":"))
+ (locpath (string-append locales "/lib/locale")))
(wrap-program (string-append out "/bin/guix")
`("GUILE_LOAD_PATH" ":" prefix (,path))
- `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath)))
+ `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath))
+ `("GUIX_LOCPATH" ":" suffix (,locpath)))
#t))))))
(native-inputs `(("pkg-config" ,pkg-config)
@@ -282,7 +286,9 @@
,@(if (and (not (%current-target-system))
(string=? (%current-system) "x86_64-linux"))
`(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux")))
- '())))
+ '())
+
+ ("glibc-utf8-locales" ,glibc-utf8-locales)))
(propagated-inputs
`(("gnutls" ,gnutls)
("guile-gcrypt" ,guile-gcrypt)
--
2.20.1
next prev parent reply other threads:[~2019-02-14 22:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-14 22:17 [bug#34480] [PATCH 0/2] Ensure Guix always has 'glibc-utf8-locales' Ludovic Courtès
2019-02-14 22:21 ` [bug#34480] [PATCH 1/2] self: Bundle 'glibc-utf8-locales' Ludovic Courtès
2019-02-14 22:21 ` Ludovic Courtès [this message]
2019-02-15 16:25 ` [bug#34480] [PATCH 0/2] Ensure Guix always has 'glibc-utf8-locales' Leo Famulari
2019-02-15 16:30 ` Ricardo Wurmus
2019-02-16 0:07 ` bug#34480: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190214222120.10914-2-ludo@gnu.org \
--to=ludo@gnu.org \
--cc=34480@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).