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.

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.