summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2018-06-14 23:44:54 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2018-06-15 09:57:15 +0200
commit50ca5fb332ebb524da405dcdb8d202adcabc1f75 (patch)
treea7624e87a5d6220684f6fe4976bc667ed506360f /gnu
parent657bed34f4b5de3863fa815dabd94ba40bd4dec7 (diff)
downloadguix-50ca5fb332ebb524da405dcdb8d202adcabc1f75.tar.gz
gnu: fcitx: Update to 4.2.9.6.
* gnu/packages/fcitx.scm (fcitx): Update to 4.2.9.6.
[native-inputs]: Add extra-cmake-modules.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/fcitx.scm12
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm
index 6dd7797aa4..8225d253ac 100644
--- a/gnu/packages/fcitx.scm
+++ b/gnu/packages/fcitx.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -35,14 +36,14 @@
 (define-public fcitx
   (package
     (name "fcitx")
-    (version "4.2.8.6")
+    (version "4.2.9.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://download.fcitx-im.org/fcitx/"
                                   name "-" version "_dict.tar.xz"))
               (sha256
                (base32
-                "15ymd42kg920ri0f8fymq3i68g8k1kgpmdlnk9jf5fvnz6g4w0wi"))))
+                "0hyrh3v82a32ylnlvzrp6cmq56x4p1a42q5xc6njmmj2msxm34x5"))))
     (build-system cmake-build-system)
     (outputs '("out" "gtk2" "gtk3"))
     (arguments
@@ -65,7 +66,12 @@
              "-DENABLE_QT_IM_MODULE=OFF")))
     (native-inputs
      `(("doxygen"    ,doxygen)
-       ("glib:bin"   ,glib "bin")    ; for glib-genmarshal
+       ("extra-cmake-modules"
+        ;; XXX: We can't simply #:use-module due to a cycle somewhere.
+        ,(module-ref
+          (resolve-interface '(gnu packages kde-frameworks))
+          'extra-cmake-modules))
+       ("glib:bin"   ,glib "bin")       ; for glib-genmarshal
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("dbus"             ,dbus)