From 590021db3f3fae35d9773ff8fce59623ad7236cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Aug 2016 10:23:19 +0200 Subject: gnu: ibus: Use modify-phases syntax. * gnu/packages/ibus.scm (ibus)[arguments]: Use modify-phases syntax. --- gnu/packages/ibus.scm | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'gnu/packages/ibus.scm') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index db7d084fc7..bf40b01b4f 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Chris Marusich ;;; @@ -62,24 +62,23 @@ (assoc-ref %outputs "out") "/lib/python2.7/site-packages/gi/overrides/")) #:phases - (alist-cons-before - 'configure 'disable-dconf-update - (lambda _ - (substitute* "data/dconf/Makefile.in" - (("dconf update") "echo dconf update")) - #t) - (alist-cons-after - 'wrap-program 'wrap-with-additional-paths - (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and - ;; GI_TYPELIB_PATH. - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/ibus-setup") - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) - `("GI_TYPELIB_PATH" ":" prefix - (,(getenv "GI_TYPELIB_PATH") - ,(string-append out "/lib/girepository-1.0")))))) - %standard-phases)))) + (modify-phases %standard-phases + (add-before 'configure 'disable-dconf-update + (lambda _ + (substitute* "data/dconf/Makefile.in" + (("dconf update") "echo dconf update")) + #t)) + (add-after 'wrap-program 'wrap-with-additional-paths + (lambda* (#:key outputs #:allow-other-keys) + ;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and + ;; GI_TYPELIB_PATH. + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/ibus-setup") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH") + ,(string-append out "/lib/girepository-1.0"))))) + #t))))) (inputs `(("dbus" ,dbus) ("dconf" ,dconf) -- cgit v1.2.3