From 1165b08f8683b2a8c12753eb6fd26c2451bce81c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 7 Apr 2017 22:41:46 +0200
Subject: [PATCH] build: Include 'glibc-utf8-locales' in the binary tarball.

* Makefile.am (guix-binary.%.tar.xz): Add 'glibc-utf8-locales' and
'glibc-final' to the 'guix pack' command line.
* doc/guix.texi (Binary Installation): Mention 'etc/profile'.
---
 Makefile.am   | 6 ++++--
 doc/guix.texi | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c713d9a3f6..c16a1cf6e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -489,11 +489,13 @@ AM_DISTCHECK_CONFIGURE_FLAGS =			\
   --with-nix-prefix="$(NIX_PREFIX)"		\
   --enable-daemon
 
-# The self-contained tarball.
+# The self-contained tarball.  Add 'glibc-utf8-locales' along with glibc just
+# so 'etc/profile' defines 'GUIX_LOCPATH' pointing to a valid set of locales.
 guix-binary.%.tar.xz:
 	$(AM_V_GEN)GUIX_PACKAGE_PATH=				\
 	tarball=`$(top_builddir)/pre-inst-env guix pack -C xz	\
-	  -s "$*" --localstatedir guix` ;			\
+	  -s "$*" --localstatedir guix glibc-utf8-locales	\
+	  -e  '(@@ (gnu packages commencement) glibc-final)'` ;	\
 	cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@"
 
 
diff --git a/doc/guix.texi b/doc/guix.texi
index 07ae660f77..d0f21edeec 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -439,6 +439,14 @@ Make @code{root}'s profile available under @file{~/.guix-profile}:
          ~root/.guix-profile
 @end example
 
+Source @file{etc/profile} to augment @code{PATH} and other relevant
+environment variables:
+
+@example
+# GUIX_PROFILE=$HOME/.guix-profile \
+  source $GUIX_PROFILE/etc/profile
+@end example
+
 @item
 Create the group and user accounts for build users as explained below
 (@pxref{Build Environment Setup}).