diff options
Diffstat (limited to 'pkgs/tools/inputmethods/uim/default.nix')
| -rw-r--r-- | pkgs/tools/inputmethods/uim/default.nix | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 4e52e605686..70d3e8e8725 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -7,8 +7,7 @@ , withGtk2 ? withGtk, gtk2 ? null , withGtk3 ? withGtk, gtk3 ? null , withQt ? true -, withQt4 ? withQt, qt4 ? null -, withQt5 ? false, qt5 ? null +, withQt5 ? withQt, qt5 ? null , withLibnotify ? true, libnotify ? null , withSqlite ? true, sqlite ? null , withNetworking ? true, curl ? null, openssl ? null @@ -21,13 +20,6 @@ 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; @@ -60,7 +52,6 @@ stdenv.mkDerivation rec { ++ 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 @@ -114,10 +105,6 @@ stdenv.mkDerivation rec { ++ 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" |