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/language.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/language.scm')
| -rw-r--r-- | gnu/packages/language.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 55a1b72d74..8929882697 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -48,6 +48,7 @@ #:use-module (gnu packages perl-check) #:use-module (gnu packages qt) #:use-module (gnu packages sqlite) + #:use-module (gnu packages serialization) #:use-module (gnu packages swig) #:use-module (gnu packages texinfo) #:use-module (gnu packages web) @@ -88,7 +89,8 @@ `(#:imported-modules (,@%glib-or-gtk-build-system-modules (guix build cmake-build-system) - (guix build qt-build-system)) + (guix build qt-build-system) + (guix build qt-utils)) #:modules ((guix build glib-or-gtk-build-system) ((guix build qt-build-system) @@ -184,7 +186,7 @@ ("hangul" ,libhangul) ("m17n-db" ,m17n-db) ("m17n-lib" ,m17n-lib) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("rime" ,librime) ("rsvg" ,librsvg) ("wayland" ,wayland) @@ -223,7 +225,8 @@ focuses especially on Korean input (Hangul, Hanja, ...).") #:imported-modules (,@%glib-or-gtk-build-system-modules (guix build cmake-build-system) - (guix build qt-build-system)) + (guix build qt-build-system) + (guix build qt-utils)) #:modules ((guix build glib-or-gtk-build-system) ((guix build qt-build-system) @@ -255,7 +258,7 @@ focuses especially on Korean input (Hangul, Hanja, ...).") ("appindicator" ,libappindicator) ("chewing" ,libchewing) ("gtk+" ,gtk+) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("xtst" ,libxtst))) (synopsis "HIME Input Method Editor") (description "Hime is an extremely easy-to-use input method framework. It |