[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: ibus: Use new ucd package.
From: |
guix-commits |
Subject: |
02/02: gnu: ibus: Use new ucd package. |
Date: |
Mon, 3 Feb 2020 11:06:11 -0500 (EST) |
rekado pushed a commit to branch master
in repository guix.
commit a9e5e6497a9b5acfb0a277122f807ef5b59dd394
Author: Leo Prikler <address@hidden>
AuthorDate: Fri Jan 17 11:35:24 2020 +0100
gnu: ibus: Use new ucd package.
* 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 <address@hidden>
---
gnu/packages/ibus.scm | 24 +++---------------------
1 file changed, 3 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 16dfbf4..c0766c0 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -82,16 +82,11 @@
(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 @@
(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