summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-08-02 18:05:23 +0200
committerLudovic Courtès <ludo@gnu.org>2016-08-02 18:07:19 +0200
commitab3a64507a792e4da0527b423fbc28f8768e736a (patch)
tree6e754531160bc86c3a0d574fe5daa928748070be
parenta5c376034f0c465c00e88283dae6d59ac49612a9 (diff)
downloadpatches-ab3a64507a792e4da0527b423fbc28f8768e736a.tar
patches-ab3a64507a792e4da0527b423fbc28f8768e736a.tar.gz
system: Define 'GUIX_LOCPATH' to work around 'glibc' package defect.
Our 'glibc' package currently ignores /run/current-system/locale, although the intent is to look for locales in that directory. * gnu/packages/base.scm (glibc/linux): Add comment about /run/current-system/locale being ignored. * gnu/system.scm (operating-system-environment-variables): Add 'GUIX_LOCPATH'. * gnu/tests/base.scm (run-basic-test): Add "locale" test.
-rw-r--r--gnu/packages/base.scm1
-rw-r--r--gnu/system.scm7
-rw-r--r--gnu/tests/base.scm12
3 files changed, 19 insertions, 1 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 5edf3eb493..a476837102 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -535,6 +535,7 @@ store.")
;;
;; `--localedir' is not honored, so work around it.
;; See <http://sourceware.org/ml/libc-alpha/2013-03/msg00093.html>.
+ ;; FIXME: This hack no longer works on 2.23!
(string-append "libc_cv_localedir=/run/current-system/locale/"
,version)
diff --git a/gnu/system.scm b/gnu/system.scm
index 04dd7a845c..d6bf6c413c 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -545,7 +545,12 @@ use 'plain-file' instead~%")
;; By default, applications that use D-Bus, such as Emacs, abort at startup
;; when /etc/machine-id is missing. Make sure these warnings are non-fatal.
- ("DBUS_FATAL_WARNINGS" . "0")))
+ ("DBUS_FATAL_WARNINGS" . "0")
+
+ ;; XXX: Normally we wouldn't need to do this, but our glibc@2.23 package
+ ;; looks things up in 'PREFIX/lib/locale' instead of
+ ;; '/run/current-system/locale' as was intended.
+ ("GUIX_LOCPATH" . "/run/current-system/locale")))
(define %setuid-programs
;; Default set of setuid-root programs.
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index a6278b25d4..7170ab1e38 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -178,6 +178,18 @@ info --version")
'(false-if-exception (getaddrinfo "does-not-exist"))
marionette))
+ (test-equal "locale"
+ "en_US.utf8"
+ (marionette-eval '(begin
+ ;; XXX: This 'setenv' call wouldn't be needed
+ ;; but our glibc@2.23 currently ignores
+ ;; /run/current-system/locale.
+ (setenv "GUIX_LOCPATH"
+ "/run/current-system/locale")
+ (let ((before (setlocale LC_ALL "en_US.utf8")))
+ (setlocale LC_ALL before)))
+ marionette))
+
(test-assert "screendump"
(begin
(marionette-control (string-append "screendump " #$output