me
/
guix
Archived
1
0
Fork 0
Code

gnu: ibus: Use modify-phases syntax. 

* gnu/packages/ibus.scm (ibus)[arguments]: Use modify-phases syntax.
master
Ricardo Wurmus 2016-08-25 10:23:19 +02:00
parent d2a7a14572
commit 590021db3f
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gnu/packages/ibus.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; ;;;
@ -62,24 +62,23 @@
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib/python2.7/site-packages/gi/overrides/")) "/lib/python2.7/site-packages/gi/overrides/"))
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'disable-dconf-update (add-before 'configure 'disable-dconf-update
(lambda _ (lambda _
(substitute* "data/dconf/Makefile.in" (substitute* "data/dconf/Makefile.in"
(("dconf update") "echo dconf update")) (("dconf update") "echo dconf update"))
#t) #t))
(alist-cons-after (add-after 'wrap-program 'wrap-with-additional-paths
'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 ;; GI_TYPELIB_PATH.
;; GI_TYPELIB_PATH. (let ((out (assoc-ref outputs "out")))
(let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/ibus-setup")
(wrap-program (string-append out "/bin/ibus-setup") `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) `("GI_TYPELIB_PATH" ":" prefix
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")
(,(getenv "GI_TYPELIB_PATH") ,(string-append out "/lib/girepository-1.0")))))
,(string-append out "/lib/girepository-1.0")))))) #t)))))
%standard-phases))))
(inputs (inputs
`(("dbus" ,dbus) `(("dbus" ,dbus)
("dconf" ,dconf) ("dconf" ,dconf)