From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:35317) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isFNo-0002zY-Cj for guix-patches@gnu.org; Thu, 16 Jan 2020 19:21:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isFNm-0000hD-Cf for guix-patches@gnu.org; Thu, 16 Jan 2020 19:21:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1isFNm-0000h7-9g for guix-patches@gnu.org; Thu, 16 Jan 2020 19:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1isFNm-00025F-6V for guix-patches@gnu.org; Thu, 16 Jan 2020 19:21:02 -0500 Subject: [bug#39086] [PATCH 4/5] gnu: ibus: Build with emoji support. Resent-Message-ID: From: Leo Prikler Date: Fri, 17 Jan 2020 01:19:07 +0100 Message-Id: <20200117001905.21023-4-leo.prikler@student.tugraz.at> In-Reply-To: <20200111120829.29821-1-leo.prikler@student.tugraz.at> References: <20200111120829.29821-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39086@debbugs.gnu.org Cc: Ricardo Wurmus * gnu/packages/ibus.scm (ibus)[inputs]: Add unicode-emoji and unicode-cldr-common. [arguments]: Use list instead of quote. Add flags for unicode-emoji-dir and emoji-annotation-dir. --- gnu/packages/ibus.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) 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 -- 2.25.0