nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 <ludo@gnu.org>
This commit is contained in:
Timo Eisenmann 2018-09-26 17:01:33 +02:00 committed by Ludovic Courtès
parent 09b7300c01
commit e15ede6e28
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/enlightenment.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -268,13 +269,19 @@ Libraries with some extra bells and whistles.")
(add-before 'configure 'set-system-actions (add-before 'configure 'set-system-actions
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((xkeyboard (assoc-ref inputs "xkeyboard-config")) (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 ;; We need to patch the path to 'base.lst' to be able
;; to switch the keyboard layout in E. ;; 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") (("/usr/share/X11/xkb/rules/xorg.lst")
(string-append xkeyboard (string-append xkeyboard
"/share/X11/xkb/rules/base.lst"))) "/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" (substitute* "src/modules/everything/evry_plug_apps.c"
(("/usr/bin/") "")) (("/usr/bin/") ""))
(substitute* "configure" (substitute* "configure"