From 0873cce16e885e8b1c90f341eda978b2bcb05215 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 17 Jan 2020 01:19:07 +0100 Subject: gnu: ibus: Build with emoji support. * gnu/packages/ibus.scm (ibus)[native-inputs]: Add unicode-emoji and unicode-cldr-common. [arguments]: Use list instead of quote. Add flags for unicode-emoji-dir and emoji-annotation-dir. Signed-off-by: Ricardo Wurmus --- gnu/packages/ibus.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'gnu/packages/ibus.scm') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 512a1ff9ec..1e8b441301 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) #:use-module (gnu packages textutils) + #:use-module (gnu packages unicode) #:use-module (gnu packages xorg)) (define-public ibus @@ -70,11 +71,18 @@ (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; tests fail because there's no connection to dbus - #:configure-flags `("--disable-emoji-dict" ; cannot find emoji.json path - "--enable-python-library" - ,(string-append "--with-ucd-dir=" - (getcwd) "/ucd") - "--enable-wayland") + #:configure-flags (list "--enable-python-library" + (string-append + "--with-unicode-emoji-dir=" + (assoc-ref %build-inputs "unicode-emoji") + "/share/unicode/emoji") + (string-append + "--with-emoji-annotation-dir=" + (assoc-ref %build-inputs "unicode-cldr-common") + "/share/unicode/cldr/common/annotations") + (string-append "--with-ucd-dir=" + (getcwd) "/ucd") + "--enable-wayland") #:phases (modify-phases %standard-phases (add-after 'unpack 'prepare-ucd-dir @@ -150,6 +158,8 @@ `(("glib" ,glib "bin") ; for glib-genmarshal ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler + ("unicode-emoji" ,unicode-emoji) + ("unicode-cldr-common" ,unicode-cldr-common) ;; XXX TODO: Move Unicode data to its own (versioned) package. ("unicode-nameslist" ,(origin -- cgit v1.2.3 From 933bb1acdba5fc216d12f4eb98808e57102d7654 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 17 Jan 2020 01:19:08 +0100 Subject: gnu: ibus: Disable parallel build. * gnu/packages/ibus.scm (ibus)[arguments]: Disable parallel build. Signed-off-by: Ricardo Wurmus --- gnu/packages/ibus.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/ibus.scm') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 1e8b441301..16dfbf4888 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -71,6 +71,7 @@ (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; tests fail because there's no connection to dbus + #:parallel-build? #f ; race condition discovered with emoji support #:configure-flags (list "--enable-python-library" (string-append "--with-unicode-emoji-dir=" -- cgit v1.2.3 From a9e5e6497a9b5acfb0a277122f807ef5b59dd394 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 17 Jan 2020 11:35:24 +0100 Subject: 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 --- gnu/packages/ibus.scm | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'gnu/packages/ibus.scm') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 16dfbf4888..c0766c06bd 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 -- cgit v1.2.3