ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ibus: Use new ucd package.

Browse source 
* gnu/packages/ibus.scm (ibus)[native-inputs]: Add ucd;
remove unicode-nameslist and unicode-blocks.
[arguments]: Update configure flags and remove prepare-ucd-dir phase.

Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
This commit is contained in:
Leo Prikler 2020-01-17 11:35:24 +01:00 committed by Ricardo Wurmus
parent 5a2ef79db2
commit a9e5e6497a
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/ibus.scm
View file

@ -82,16 +82,11 @@ (define-public ibus
(assoc-ref %build-inputs "unicode-cldr-common")
"/share/unicode/cldr/common/annotations")
(string-append "--with-ucd-dir="
(getcwd) "/ucd")
(assoc-ref %build-inputs "ucd")
"/share/ucd")
"--enable-wayland")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'prepare-ucd-dir
(lambda* (#:key inputs #:allow-other-keys)
(mkdir-p "../ucd")
(symlink (assoc-ref inputs "unicode-blocks") "../ucd/Blocks.txt")
(symlink (assoc-ref inputs "unicode-nameslist") "../ucd/NamesList.txt")
#t))
(add-after 'unpack 'patch-python-target-directories
(lambda* (#:key outputs #:allow-other-keys)
(let ((root (string-append (assoc-ref outputs "out")
@ -158,22 +153,9 @@ (define-public ibus
(native-inputs
`(("glib" ,glib "bin") ; for glib-genmarshal
("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler
("ucd" ,ucd)
("unicode-emoji" ,unicode-emoji)
("unicode-cldr-common" ,unicode-cldr-common)
;; XXX TODO: Move Unicode data to its own (versioned) package.
("unicode-nameslist"
,(origin
(method url-fetch)
(uri "https://www.unicode.org/Public/12.0.0/ucd/NamesList.txt")
(sha256
(base32 "0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61"))))
("unicode-blocks"
,(origin
(method url-fetch)
(uri "https://www.unicode.org/Public/12.0.0/ucd/Blocks.txt")
(sha256
(base32 "041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1"))))
("vala" ,vala)
("pkg-config" ,pkg-config)))
(native-search-paths