pyrox.dev
uim: remove qt4, fix qt5
+1
-1
nixos/modules/i18n/input-method/uim.nix
+1
-1
nixos/modules/i18n/input-method/uim.nix
···
10
10
11
11
i18n.inputMethod.uim = {
12
12
toolbar = mkOption {
13
-
type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ];
13
+
type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt5" ];
14
14
default = "gtk";
15
15
example = "gtk-systray";
16
16
description = lib.mdDoc ''
+1
-14
pkgs/tools/inputmethods/uim/default.nix
+1
-14
pkgs/tools/inputmethods/uim/default.nix
···
7
7
, withGtk2 ? withGtk, gtk2 ? null
8
8
, withGtk3 ? withGtk, gtk3 ? null
9
9
, withQt ? true
10
-
, withQt4 ? withQt, qt4 ? null
11
-
, withQt5 ? false, qt5 ? null
10
+
, withQt5 ? withQt, qt5 ? null
12
11
, withLibnotify ? true, libnotify ? null
13
12
, withSqlite ? true, sqlite ? null
14
13
, withNetworking ? true, curl ? null, openssl ? null
···
21
20
assert withGtk2 -> gtk2 != null;
22
21
assert withGtk3 -> gtk3 != null;
23
22
24
-
# TODO(@oxij): ./configure can't find both qmakes at the same time
25
-
# this can be fixed by adding an alias qmake -> qmaka${version} in qmake derivation
26
-
assert withQt4 -> !withQt5 && qt4 != null;
27
-
assert withQt5 -> !withQt4 && qt5 != null;
28
-
29
-
assert !withQt5; # fails to build with "Makefile.qmake: No such file or directory"
30
-
31
23
assert withAnthy -> anthy != null;
32
24
assert withLibnotify -> libnotify != null;
33
25
assert withSqlite -> sqlite != null;
···
60
52
++ lib.optional withAnthy anthy
61
53
++ lib.optional withGtk2 gtk2
62
54
++ lib.optional withGtk3 gtk3
63
-
++ lib.optional withQt4 qt4
64
55
++ lib.optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ]
65
56
++ lib.optional withLibnotify libnotify
66
57
++ lib.optional withSqlite sqlite
···
114
105
++ lib.optional withAnthy "--with-anthy-utf8"
115
106
++ lib.optional withGtk2 "--with-gtk2"
116
107
++ lib.optional withGtk3 "--with-gtk3"
117
-
++ lib.optionals withQt4 [
118
-
"--with-qt4"
119
-
"--with-qt4-immodule"
120
-
]
121
108
++ lib.optionals withQt5 [
122
109
"--with-qt5"
123
110
"--with-qt5-immodule"