diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2023-05-06 14:28:06 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2023-05-06 14:39:04 +0200 |
| commit | 33d626da7dff55b99baa4e458ce7bfac83f6c469 (patch) | |
| tree | e23fc55f458f16eee01b76f6ac13412a75eeb4f2 | |
| parent | 40d6615ca2755605e8aab790fbbae0221ec1d827 (diff) | |
| download | guix-33d626da7dff55b99baa4e458ce7bfac83f6c469.tar.gz | |
gnu: ibus-libpinyin: Drop package labels and use G-exps.
* gnu/packages/ibus.scm (ibus-libpinyin)[arguments]: Use G-expression. [inputs]: Drop labels.
| -rw-r--r-- | gnu/packages/ibus.scm | 63 |
1 files changed, 32 insertions, 31 deletions
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 54f91ba848..a6b801c7e7 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015-2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> @@ -270,37 +270,38 @@ may also simplify input method development.") "0xl2lmffy42f6h6za05z4vpazpza1a9gsrva65giwyv3kpf652dd")))) (build-system glib-or-gtk-build-system) (arguments - `(#:configure-flags - '("--enable-opencc") - #:phases - (modify-phases %standard-phases - (add-after 'wrap-program 'wrap-with-additional-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Make sure 'ibus-setup-libpinyin' runs with the correct - ;; PYTHONPATH and GI_TYPELIB_PATH. - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/libexec/ibus-setup-libpinyin") - `("GUIX_PYTHONPATH" ":" prefix - (,(getenv "GUIX_PYTHONPATH") - ,(string-append (assoc-ref inputs "ibus") - "/lib/girepository-1.0") - ,(string-append (assoc-ref outputs "out") - "/share/ibus-libpinyin/setup/"))) - `("GI_TYPELIB_PATH" ":" prefix - (,(string-append (assoc-ref inputs "ibus") - "/lib/girepository-1.0") - ,(string-append (assoc-ref outputs "out") - "/share/ibus-libpinyin/setup/")))) - #t)))))) + (list + #:configure-flags + '(list "--enable-opencc") + #:phases + #~(modify-phases %standard-phases + (add-after 'wrap-program 'wrap-with-additional-paths + (lambda _ + ;; Make sure 'ibus-setup-libpinyin' runs with the correct + ;; PYTHONPATH and GI_TYPELIB_PATH. + (wrap-program (string-append #$output "/libexec/ibus-setup-libpinyin") + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH") + ,(string-append #$(this-package-input "ibus") + "/lib/girepository-1.0") + ,(string-append #$output + "/share/ibus-libpinyin/setup/"))) + `("GI_TYPELIB_PATH" ":" prefix + (,(string-append #$(this-package-input "ibus") + "/lib/girepository-1.0") + ,(string-append #$(this-package-input "gtk+") + "/lib/girepository-1.0") + ,(string-append #$output + "/share/ibus-libpinyin/setup/"))))))))) (inputs - `(("ibus" ,ibus) - ("libpinyin" ,libpinyin) - ("bdb" ,bdb) - ("sqlite" ,sqlite) - ("opencc" ,opencc) - ("python" ,python) - ("pygobject2" ,python-pygobject) - ("gtk+" ,gtk+))) + (list ibus + libpinyin + bdb + sqlite + opencc + python + python-pygobject + gtk+)) (native-inputs (list pkg-config intltool `(,glib "bin"))) |