From 28035fa1ff242d1e4d45fccf0dfe58742702d6aa Mon Sep 17 00:00:00 2001 From: Timo Eisenmann Date: Wed, 26 Sep 2018 17:01:33 +0200 Subject: [PATCH] enlightenment.scm: Fix initial locale and keyboard selection * gnu/packages/enlightenment.scm (enlightenment): Fix paths to 'locale' and 'xorg.lst' --- gnu/packages/enlightenment.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 45dc1dbbe..0ced70288 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -268,13 +268,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" -- 2.18.0