gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uim: remove qt4, fix qt5

Browse Source
This commit is contained in:
ajs124
2022-05-09 23:54:40 +01:00
parent 79ff04f384
commit 308baf3049
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/i18n/input-method/uim.nix
View File

@@ -10,7 +10,7 @@ in
i18n.inputMethod.uim = { i18n.inputMethod.uim = {
toolbar = mkOption { toolbar = mkOption {
type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ]; type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt5" ];
default = "gtk"; default = "gtk";
example = "gtk-systray"; example = "gtk-systray";
description = lib.mdDoc '' description = lib.mdDoc ''

15
pkgs/tools/inputmethods/uim/default.nix
View File

@@ -7,8 +7,7 @@
, withGtk2 ? withGtk, gtk2 ? null , withGtk2 ? withGtk, gtk2 ? null
, withGtk3 ? withGtk, gtk3 ? null , withGtk3 ? withGtk, gtk3 ? null
, withQt ? true , withQt ? true
, withQt4 ? withQt, qt4 ? null , withQt5 ? withQt, qt5 ? null
, withQt5 ? false, qt5 ? null
, withLibnotify ? true, libnotify ? null , withLibnotify ? true, libnotify ? null
, withSqlite ? true, sqlite ? null , withSqlite ? true, sqlite ? null
, withNetworking ? true, curl ? null, openssl ? null , withNetworking ? true, curl ? null, openssl ? null
@@ -21,13 +20,6 @@
assert withGtk2 -> gtk2 != null; assert withGtk2 -> gtk2 != null;
assert withGtk3 -> gtk3 != 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 withAnthy -> anthy != null;
assert withLibnotify -> libnotify != null; assert withLibnotify -> libnotify != null;
assert withSqlite -> sqlite != null; assert withSqlite -> sqlite != null;
@@ -60,7 +52,6 @@ stdenv.mkDerivation rec {
++ lib.optional withAnthy anthy ++ lib.optional withAnthy anthy
++ lib.optional withGtk2 gtk2 ++ lib.optional withGtk2 gtk2
++ lib.optional withGtk3 gtk3 ++ lib.optional withGtk3 gtk3
++ lib.optional withQt4 qt4
++ lib.optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ] ++ lib.optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ]
++ lib.optional withLibnotify libnotify ++ lib.optional withLibnotify libnotify
++ lib.optional withSqlite sqlite ++ lib.optional withSqlite sqlite
@@ -114,10 +105,6 @@ stdenv.mkDerivation rec {
++ lib.optional withAnthy "--with-anthy-utf8" ++ lib.optional withAnthy "--with-anthy-utf8"
++ lib.optional withGtk2 "--with-gtk2" ++ lib.optional withGtk2 "--with-gtk2"
++ lib.optional withGtk3 "--with-gtk3" ++ lib.optional withGtk3 "--with-gtk3"
++ lib.optionals withQt4 [
"--with-qt4"
"--with-qt4-immodule"
]
++ lib.optionals withQt5 [ ++ lib.optionals withQt5 [
"--with-qt5" "--with-qt5"
"--with-qt5-immodule" "--with-qt5-immodule"