me/guix
Archived
1
0
Fork 0
Code Activity

gnu: ibus: Fix simple engine.

Browse source 
* gnu/packages/ibus.scm (ibus)[inputs]: Add libx11, setxkbmap, xmodmap.
[arguments]: Add "fix-paths" phase.
This commit is contained in:
Ricardo Wurmus 2016-08-25 11:04:39 +02:00
parent d5332e756e
commit d37f00b97f
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/ibus.scm
View file

@ -36,7 +36,8 @@
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages iso-codes) #:use-module (gnu packages iso-codes)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)) #:use-module (gnu packages python)
#:use-module (gnu packages xorg))
(define-public ibus (define-public ibus
(package (package
@ -77,6 +78,16 @@
(delete-file c)))) (delete-file c))))
(find-files "." "\\.vala")) (find-files "." "\\.vala"))
#t)) #t))
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/ibusenginesimple.c"
(("/usr/share/X11/locale")
(string-append (assoc-ref inputs "libx11")
"/share/X11/locale")))
(substitute* "ui/gtk3/xkblayout.vala"
(("\"(setxkbmap|xmodmap)\"" _ prog)
(string-append "\"" (assoc-ref inputs prog) "\"")))
#t))
(add-after 'wrap-program 'wrap-with-additional-paths (add-after 'wrap-program 'wrap-with-additional-paths
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and ;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and
@ -96,6 +107,9 @@
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("intltool" ,intltool) ("intltool" ,intltool)
("libnotify" ,libnotify) ("libnotify" ,libnotify)
("libx11" ,libx11)
("setxkbmap" ,setxkbmap)
("xmodmap" ,xmodmap)
("iso-codes" ,iso-codes) ("iso-codes" ,iso-codes)
("pygobject2" ,python2-pygobject) ("pygobject2" ,python2-pygobject)
("python2" ,python-2))) ("python2" ,python-2)))