diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/fcitx.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/fcitx.scm')
| -rw-r--r-- | gnu/packages/fcitx.scm | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm index c602789b45..53680058c0 100644 --- a/gnu/packages/fcitx.scm +++ b/gnu/packages/fcitx.scm @@ -81,14 +81,13 @@ "/lib/qt5/plugins"))) #t))))) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("pkg-config" ,pkg-config))) + (list extra-cmake-modules pkg-config)) (inputs `(("fcitx" ,fcitx) ("libintl" ,intltool) ("libxkbcommon" ,libxkbcommon))) (propagated-inputs - `(("qtbase" ,qtbase-5))) + (list qtbase-5)) (synopsis "Fcitx Qt5 Input Context") (description "This package provides a Qt5 frontend for fcitx.") (home-page "https://github.com/fcitx/fcitx-qt5/") @@ -139,11 +138,7 @@ ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper))) (inputs - `(("glib" ,glib) - ("gtk+" ,gtk+) - ("libx11" ,libx11) - ("sqlite" ,sqlite) - ("tinyxml" ,tinyxml))) + (list glib gtk+ libx11 sqlite tinyxml)) (synopsis "Intelligent Predictive Text Entry System") (description "Presage generates predictions by modelling natural language as a combination of redundant information sources. It computes probabilities for |