TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: ibus-libpinyin: Update to 1.12.0.

Browse source 
* gnu/packages/ibus.scm (ibus-libpinyin): Update to 1.12.0.
[arguments]: Enable opencc; include setup files on PYTHONPATH; override
PYTHONPATH instead of prefixing.
[inputs]: Add opencc; remove python-pyxdg.
[license]: Change to GPLv3+.
This commit is contained in:
Ricardo Wurmus 2021-03-15 15:24:01 +01:00
parent f9e016baec
commit 266d55dc30
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/ibus.scm
View file

@ -174,7 +174,7 @@ (define-public ibus
(define-public ibus-libpinyin (define-public ibus-libpinyin
(package (package
(name "ibus-libpinyin") (name "ibus-libpinyin")
(version "1.11.1") (version "1.12.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/libpinyin/ibus-libpinyin/" (uri (string-append "https://github.com/libpinyin/ibus-libpinyin/"
@ -182,10 +182,12 @@ (define-public ibus-libpinyin
"/ibus-libpinyin-" version ".tar.gz")) "/ibus-libpinyin-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1bl1cgicd2df797dx1x0q904438bsn8i23djzcfcai4dp3631xc0")))) "0xl2lmffy42f6h6za05z4vpazpza1a9gsrva65giwyv3kpf652dd"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:phases `(#:configure-flags
'("--enable-opencc")
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'wrap-program 'wrap-with-additional-paths (add-after 'wrap-program 'wrap-with-additional-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -193,21 +195,25 @@ (define-public ibus-libpinyin
;; PYTHONPATH and GI_TYPELIB_PATH. ;; PYTHONPATH and GI_TYPELIB_PATH.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/libexec/ibus-setup-libpinyin") (wrap-program (string-append out "/libexec/ibus-setup-libpinyin")
`("PYTHONPATH" ":" prefix `("PYTHONPATH" ":" =
(,(getenv "PYTHONPATH") (,(getenv "PYTHONPATH")
,(string-append (assoc-ref inputs "ibus") ,(string-append (assoc-ref inputs "ibus")
"/lib/girepository-1.0"))) "/lib/girepository-1.0")
,(string-append (assoc-ref outputs "out")
"/share/ibus-libpinyin/setup/")))
`("GI_TYPELIB_PATH" ":" prefix `("GI_TYPELIB_PATH" ":" prefix
(,(string-append (assoc-ref inputs "ibus") (,(string-append (assoc-ref inputs "ibus")
"/lib/girepository-1.0")))) "/lib/girepository-1.0")
,(string-append (assoc-ref outputs "out")
"/share/ibus-libpinyin/setup/"))))
#t)))))) #t))))))
(inputs (inputs
`(("ibus" ,ibus) `(("ibus" ,ibus)
("libpinyin" ,libpinyin) ("libpinyin" ,libpinyin)
("bdb" ,bdb) ("bdb" ,bdb)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("opencc" ,opencc)
("python" ,python) ("python" ,python)
("pyxdg" ,python-pyxdg)
("pygobject2" ,python-pygobject) ("pygobject2" ,python-pygobject)
("gtk+" ,gtk+))) ("gtk+" ,gtk+)))
(native-inputs (native-inputs
@ -219,7 +225,7 @@ (define-public ibus-libpinyin
"This package includes a Chinese pinyin input method and a Chinese "This package includes a Chinese pinyin input method and a Chinese
ZhuYin (Bopomofo) input method based on libpinyin for IBus.") ZhuYin (Bopomofo) input method based on libpinyin for IBus.")
(home-page "https://github.com/libpinyin/ibus-libpinyin") (home-page "https://github.com/libpinyin/ibus-libpinyin")
(license gpl2+))) (license gpl3+)))
(define-public libpinyin (define-public libpinyin
(package (package