01/03: system: Reintroduce 'GUIX_LOCPATH', for compatibility with address@hidden

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 946465bbaffa628e08cfbc34fc8064b4b4b1644e
Author: Ludovic Courtès <address@hidden>
Date:   Tue Nov 8 23:20:11 2016 +0100

    system: Reintroduce 'GUIX_LOCPATH', for compatibility with address@hidden
    
    * gnu/system.scm (operating-system-environment-variables): Re-add
    'GUIX_LOCPATH'.  This reverts part of
    9f58fe3d1c32e3f0ced065e286532a10cad1b5e3.
---
 gnu/system.scm |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 095f728..cf220e7 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 address@hidden 
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 address@hidden packages in their profiles
+    ;; can use them correctly.
+    ;; TODO: Remove when address@hidden is long gone.
+    ("GUIX_LOCPATH" . "/run/current-system/locale")))
 
 (define %setuid-programs
   ;; Default set of setuid-root programs.