diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/fcitx.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/fcitx.scm')
| -rw-r--r-- | gnu/packages/fcitx.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm index 93cea7a24d..c602789b45 100644 --- a/gnu/packages/fcitx.scm +++ b/gnu/packages/fcitx.scm @@ -50,7 +50,7 @@ (define-public fcitx-qt5 (package (name "fcitx-qt5") - (version "1.2.5") + (version "1.2.6") (source (origin (method git-fetch) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 - (base32 "1d56bp11jp85b2r4syw1clfg4vqxqfh7gygpwz8wk5sxmfmmdq83")))) + (base32 "13sanrir696fv7s44b7q453s5qi4r7ag0r3iyggyzk8xyf6rw8fk")))) (build-system qt-build-system) (arguments `(#:tests? #f ; No target @@ -88,7 +88,7 @@ ("libintl" ,intltool) ("libxkbcommon" ,libxkbcommon))) (propagated-inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (synopsis "Fcitx Qt5 Input Context") (description "This package provides a Qt5 frontend for fcitx.") (home-page "https://github.com/fcitx/fcitx-qt5/") |