From 03f2f8524a20f2327133303048d5d81121db6acc Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 22 Dec 2017 14:57:32 +0300 Subject: [PATCH] uim: drop kde4 parts --- pkgs/tools/inputmethods/uim/default.nix | 14 ++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index bba55acc060..96b88714178 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -6,10 +6,7 @@ , withGtk3 ? withGtk, gtk3 ? null , withQt ? true , withQt4 ? withQt, qt4 ? null -, withKde ? withQt -, withKde4 ? withKde && withQt4, kdelibs4 ? null, automoc4 ? null -, withKNotify4 ? false -, withLibnotify ? !withKNotify4, libnotify ? null +, withLibnotify ? true, libnotify ? null , withSqlite ? true, sqlite ? null , withNetworking ? true, curl ? null, openssl ? null , withFFI ? true, libffi ? null @@ -24,9 +21,7 @@ assert withAnthy -> anthy != null; assert withGtk2 -> gtk2 != null; assert withGtk3 -> gtk3 != null; assert withQt4 -> qt4 != null; -assert withKde4 -> withQt4 && kdelibs4 != null && automoc4 != null; -assert withKNotify4 -> withKde4 && !withLibnotify; -assert withLibnotify -> !withKNotify4 && libnotify != null; +assert withLibnotify -> libnotify != null; assert withSqlite -> sqlite != null; assert withNetworking -> curl != null && openssl != null; assert withFFI -> libffi != null; @@ -49,9 +44,6 @@ stdenv.mkDerivation rec { ++ optional withGtk2 gtk2 ++ optional withGtk3 gtk3 ++ optional withQt4 qt4 - ++ optionals withKde4 [ - kdelibs4 automoc4 - ] ++ optional withLibnotify libnotify ++ optional withSqlite sqlite ++ optionals withNetworking [ @@ -76,8 +68,6 @@ stdenv.mkDerivation rec { "--with-qt4" "--with-qt4-immodule" ] - ++ optional withKde4 "--enable-kde4-applet" - ++ optional withKNotify4 "--enable-notify=knotify4" ++ optional withLibnotify "--enable-notify=libnotify" ++ optional withSqlite "--with-sqlite3" ++ optionals withNetworking [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7b34a2b151..063670f5bbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5091,7 +5091,7 @@ with pkgs; uhttpmock = callPackage ../development/libraries/uhttpmock { }; - uim = kde4.callPackage ../tools/inputmethods/uim { }; + uim = callPackage ../tools/inputmethods/uim { }; uhub = callPackage ../servers/uhub { };