08/08: gnu: enlightenment: Fix initial locale and keyboard selection.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit e15ede6e28cfaf5fe951faf88d7c1e3213a476a4
Author: Timo Eisenmann <address@hidden>
Date:   Wed Sep 26 17:01:33 2018 +0200

    gnu: enlightenment: Fix initial locale and keyboard selection.
    
    * gnu/packages/enlightenment.scm (enlightenment)[arguments]: In
    'set-system-actions', set absolute file name to 'locale' and 'xorg.lst'.
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 gnu/packages/enlightenment.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 45dc1db..c7812e8 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <address@hidden>
 ;;; Copyright © 2017 Nils Gillmann <address@hidden>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2018 Timo Eisenmann <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -268,13 +269,19 @@ Libraries with some extra bells and whistles.")
          (add-before 'configure 'set-system-actions
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((xkeyboard (assoc-ref inputs "xkeyboard-config"))
-                   (utils     (assoc-ref inputs "util-linux")))
+                   (utils     (assoc-ref inputs "util-linux"))
+                   (libc      (assoc-ref inputs "libc")))
                ;; We need to patch the path to 'base.lst' to be able
                ;; to switch the keyboard layout in E.
-               (substitute* "src/modules/xkbswitch/e_mod_parse.c"
+               (substitute* (list "src/modules/xkbswitch/e_mod_parse.c"
+                                  "src/modules/wizard/page_011.c")
                  (("/usr/share/X11/xkb/rules/xorg.lst")
                   (string-append xkeyboard
                                  "/share/X11/xkb/rules/base.lst")))
+               (substitute* (list "src/bin/e_intl.c"
+                                  "src/modules/conf_intl/e_int_config_intl.c"
+                                  "src/modules/wizard/page_010.c")
+                 (("locale -a") (string-append libc "/bin/locale -a")))
                (substitute* "src/modules/everything/evry_plug_apps.c"
                  (("/usr/bin/") ""))
                (substitute* "configure"