me/guix
Archived
1
0
Fork 0
Code Activity

gnu: enlightenment: Patch more hardcoded paths.

Browse source 
* gnu/packages/enlightenment.scm (enlightenment)[arguments]: Patch
hardcoded paths to mount, umount, eject, halt, reboot.
[native-inputs]: Add util-linux.
This commit is contained in:
Efraim Flashner 2017-06-19 09:48:06 +03:00
parent 00f037ca44
commit 7e60206dff
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/enlightenment.scm
View file

@ -230,19 +230,28 @@ Libraries with some extra bells and whistles.")
`(#:configure-flags '("--enable-mount-eeze") `(#:configure-flags '("--enable-mount-eeze")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'fix-keyboard (add-before 'configure 'set-system-actions
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
(let ((xkeyboard (assoc-ref %build-inputs "xkeyboard-config"))) (let ((xkeyboard (assoc-ref inputs "xkeyboard-config"))
(utils (assoc-ref inputs "util-linux")))
;; 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* "src/modules/xkbswitch/e_mod_parse.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* "configure"
(("/bin/mount") (string-append utils "/bin/mount"))
(("/bin/umount") (string-append utils "/bin/umount"))
(("/usr/bin/eject") (string-append utils "/bin/eject"))
; TODO: Replace suspend and hibernate also.
(("/sbin/shutdown -h now") "/run/current-system/profile/sbin/halt")
(("/sbin/shutdown -r now") "/run/current-system/profile/sbin/reboot"))
#t)))))) #t))))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)
("util-linux" ,util-linux)))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("dbus" ,dbus) ("dbus" ,dbus)