uim: remove qt4, fix qt5

ajs124 308baf30 79ff04f3

Changed files
+2 -15
nixos
modules
i18n
input-method
pkgs
tools
inputmethods
+1 -1
nixos/modules/i18n/input-method/uim.nix
···
i18n.inputMethod.uim = {
toolbar = mkOption {
-
type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ];
default = "gtk";
example = "gtk-systray";
description = lib.mdDoc ''
···
i18n.inputMethod.uim = {
toolbar = mkOption {
+
type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt5" ];
default = "gtk";
example = "gtk-systray";
description = lib.mdDoc ''
+1 -14
pkgs/tools/inputmethods/uim/default.nix
···
, withGtk2 ? withGtk, gtk2 ? null
, withGtk3 ? withGtk, gtk3 ? null
, withQt ? true
-
, withQt4 ? withQt, qt4 ? null
-
, withQt5 ? false, qt5 ? null
, withLibnotify ? true, libnotify ? null
, withSqlite ? true, sqlite ? null
, withNetworking ? true, curl ? null, openssl ? null
···
assert withGtk2 -> gtk2 != null;
assert withGtk3 -> gtk3 != null;
-
# TODO(@oxij): ./configure can't find both qmakes at the same time
-
# this can be fixed by adding an alias qmake -> qmaka${version} in qmake derivation
-
assert withQt4 -> !withQt5 && qt4 != null;
-
assert withQt5 -> !withQt4 && qt5 != null;
-
-
assert !withQt5; # fails to build with "Makefile.qmake: No such file or directory"
-
assert withAnthy -> anthy != null;
assert withLibnotify -> libnotify != null;
assert withSqlite -> sqlite != null;
···
++ lib.optional withAnthy anthy
++ lib.optional withGtk2 gtk2
++ lib.optional withGtk3 gtk3
-
++ lib.optional withQt4 qt4
++ lib.optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ]
++ lib.optional withLibnotify libnotify
++ lib.optional withSqlite sqlite
···
++ lib.optional withAnthy "--with-anthy-utf8"
++ lib.optional withGtk2 "--with-gtk2"
++ lib.optional withGtk3 "--with-gtk3"
-
++ lib.optionals withQt4 [
-
"--with-qt4"
-
"--with-qt4-immodule"
-
]
++ lib.optionals withQt5 [
"--with-qt5"
"--with-qt5-immodule"
···
, withGtk2 ? withGtk, gtk2 ? null
, withGtk3 ? withGtk, gtk3 ? null
, withQt ? true
+
, withQt5 ? withQt, qt5 ? null
, withLibnotify ? true, libnotify ? null
, withSqlite ? true, sqlite ? null
, withNetworking ? true, curl ? null, openssl ? null
···
assert withGtk2 -> gtk2 != null;
assert withGtk3 -> gtk3 != null;
assert withAnthy -> anthy != null;
assert withLibnotify -> libnotify != null;
assert withSqlite -> sqlite != null;
···
++ lib.optional withAnthy anthy
++ lib.optional withGtk2 gtk2
++ lib.optional withGtk3 gtk3
++ lib.optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ]
++ lib.optional withLibnotify libnotify
++ lib.optional withSqlite sqlite
···
++ lib.optional withAnthy "--with-anthy-utf8"
++ lib.optional withGtk2 "--with-gtk2"
++ lib.optional withGtk3 "--with-gtk3"
++ lib.optionals withQt5 [
"--with-qt5"
"--with-qt5-immodule"