From 2533e7f8d151f16cfbc23afa0f262dc7e096ccdf Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 1 Jul 2022 21:21:32 +0200 Subject: [PATCH] gnu: ibus-anthy: Modernize arguments. * gnu/packages/ibus.scm (ibus-anthy)[arguments]: Convert to list of G-Expressions. --- gnu/packages/ibus.scm | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 3a058c0eac..0343f58f2c 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -30,6 +30,7 @@ (define-module (gnu packages ibus) #:use-module (guix licenses) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) @@ -320,25 +321,26 @@ (define-public ibus-anthy "16vd0k8wm13s38869jqs3dnwmjvywgn0snnpyi41m28binhlssf8")))) (build-system gnu-build-system) (arguments - '(#:configure-flags - ;; Use absolute exec path in the anthy.xml. - (list (string-append "--libexecdir=" %output "/libexec")) - ;; The test suite fails (see: - ;; https://github.com/ibus/ibus-anthy/issues/28). - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-programs - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (prog) - (wrap-program (string-append out "/libexec/" prog) - `("GUIX_PYTHONPATH" ":" prefix - (,(getenv "GUIX_PYTHONPATH"))) - `("GI_TYPELIB_PATH" ":" prefix - (,(getenv "GI_TYPELIB_PATH") - ,(string-append out "/lib/girepository-1.0"))))) - '("ibus-engine-anthy" "ibus-setup-anthy")))))))) + (list + #:configure-flags + ;; Use absolute exec path in the anthy.xml. + #~(list (string-append "--libexecdir=" #$output "/libexec")) + ;; The test suite fails (see: + ;; https://github.com/ibus/ibus-anthy/issues/28). + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-programs + (lambda* (#:key inputs #:allow-other-keys) + (for-each + (lambda (prog) + (wrap-program (string-append #$output "/libexec/" prog) + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH") + ,(string-append #$output "/lib/girepository-1.0"))))) + '("ibus-engine-anthy" "ibus-setup-anthy"))))))) (native-inputs (list gettext-minimal `(,glib "bin")