diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-11-08 23:20:11 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-11-08 23:31:27 +0100 |
| commit | 946465bbaffa628e08cfbc34fc8064b4b4b1644e (patch) | |
| tree | 598960082ad1f075bdf010680413f1296c4893d4 | |
| parent | e3ec6c806a1ded623280b1520a823e4c9c1bfb16 (diff) | |
| download | guix-946465bbaffa628e08cfbc34fc8064b4b4b1644e.tar.gz guix-946465bbaffa628e08cfbc34fc8064b4b4b1644e.zip | |
system: Reintroduce 'GUIX_LOCPATH', for compatibility with glibc@2.23.
* gnu/system.scm (operating-system-environment-variables): Re-add
'GUIX_LOCPATH'. This reverts part of
9f58fe3d1c32e3f0ced065e286532a10cad1b5e3.
| -rw-r--r-- | gnu/system.scm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 095f7286f0..cf220e72fd 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -566,7 +566,15 @@ 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 + ;; used to look things up in 'PREFIX/lib/locale' instead of + ;; '/run/current-system/locale' as was intended. Keep this hack around so + ;; that people who still have glibc@2.23-using packages in their profiles + ;; can use them correctly. + ;; TODO: Remove when glibc@2.23 is long gone. + ("GUIX_LOCPATH" . "/run/current-system/locale"))) (define %setuid-programs ;; Default set of setuid-root programs. |