From 308baf304984fb5bb94f0b69f4b4dc8d5030405d Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 9 May 2022 23:54:40 +0100
Subject: [PATCH] uim: remove qt4, fix qt5

---
 nixos/modules/i18n/input-method/uim.nix |  2 +-
 pkgs/tools/inputmethods/uim/default.nix | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/i18n/input-method/uim.nix b/nixos/modules/i18n/input-method/uim.nix
index 9491ab2640fc..7225783b2a6f 100644
--- a/nixos/modules/i18n/input-method/uim.nix
+++ b/nixos/modules/i18n/input-method/uim.nix
@@ -10,7 +10,7 @@ in
 
     i18n.inputMethod.uim = {
       toolbar = mkOption {
-        type    = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ];
+        type    = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt5" ];
         default = "gtk";
         example = "gtk-systray";
         description = lib.mdDoc ''
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 4e52e6056867..70d3e8e8725c 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"