diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-08-02 18:05:23 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-08-02 18:07:19 +0200 |
| commit | ab3a64507a792e4da0527b423fbc28f8768e736a (patch) | |
| tree | 6e754531160bc86c3a0d574fe5daa928748070be /gnu/system.scm | |
| parent | a5c376034f0c465c00e88283dae6d59ac49612a9 (diff) | |
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.
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 04dd7a845c2..d6bf6c413c3 100644 --- a/gnu/system.scm +++ b/gnu/system.scm | |||
| @@ -545,7 +545,12 @@ use 'plain-file' instead~%") | |||
| 545 | 545 | ||
| 546 | ;; By default, applications that use D-Bus, such as Emacs, abort at startup | 546 | ;; By default, applications that use D-Bus, such as Emacs, abort at startup |
| 547 | ;; when /etc/machine-id is missing. Make sure these warnings are non-fatal. | 547 | ;; when /etc/machine-id is missing. Make sure these warnings are non-fatal. |
| 548 | ("DBUS_FATAL_WARNINGS" . "0"))) | 548 | ("DBUS_FATAL_WARNINGS" . "0") |
| 549 | |||
| 550 | ;; XXX: Normally we wouldn't need to do this, but our glibc@2.23 package | ||
| 551 | ;; looks things up in 'PREFIX/lib/locale' instead of | ||
| 552 | ;; '/run/current-system/locale' as was intended. | ||
| 553 | ("GUIX_LOCPATH" . "/run/current-system/locale"))) | ||
| 549 | 554 | ||
| 550 | (define %setuid-programs | 555 | (define %setuid-programs |
| 551 | ;; Default set of setuid-root programs. | 556 | ;; Default set of setuid-root programs. |
