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

uim: drop kde4 parts

Browse Source
This commit is contained in:
gnidorah 2017-12-22 14:57:32 +03:00
parent 6236dd8e2d
commit 03f2f8524a
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,10 +6,7 @@
, withGtk3 ? withGtk, gtk3 ? null , withGtk3 ? withGtk, gtk3 ? null
, withQt ? true , withQt ? true
, withQt4 ? withQt, qt4 ? null , withQt4 ? withQt, qt4 ? null
, withKde ? withQt , withLibnotify ? true, libnotify ? null
, withKde4 ? withKde && withQt4, kdelibs4 ? null, automoc4 ? null
, withKNotify4 ? false
, withLibnotify ? !withKNotify4, libnotify ? null
, withSqlite ? true, sqlite ? null , withSqlite ? true, sqlite ? null
, withNetworking ? true, curl ? null, openssl ? null , withNetworking ? true, curl ? null, openssl ? null
, withFFI ? true, libffi ? null , withFFI ? true, libffi ? null
@ -24,9 +21,7 @@ assert withAnthy -> anthy != null;
assert withGtk2 -> gtk2 != null; assert withGtk2 -> gtk2 != null;
assert withGtk3 -> gtk3 != null; assert withGtk3 -> gtk3 != null;
assert withQt4 -> qt4 != null; assert withQt4 -> qt4 != null;
assert withKde4 -> withQt4 && kdelibs4 != null && automoc4 != null; assert withLibnotify -> libnotify != null;
assert withKNotify4 -> withKde4 && !withLibnotify;
assert withLibnotify -> !withKNotify4 && libnotify != null;
assert withSqlite -> sqlite != null; assert withSqlite -> sqlite != null;
assert withNetworking -> curl != null && openssl != null; assert withNetworking -> curl != null && openssl != null;
assert withFFI -> libffi != null; assert withFFI -> libffi != null;
@ -49,9 +44,6 @@ stdenv.mkDerivation rec {
++ optional withGtk2 gtk2 ++ optional withGtk2 gtk2
++ optional withGtk3 gtk3 ++ optional withGtk3 gtk3
++ optional withQt4 qt4 ++ optional withQt4 qt4
++ optionals withKde4 [
kdelibs4 automoc4
]
++ optional withLibnotify libnotify ++ optional withLibnotify libnotify
++ optional withSqlite sqlite ++ optional withSqlite sqlite
++ optionals withNetworking [ ++ optionals withNetworking [
@ -76,8 +68,6 @@ stdenv.mkDerivation rec {
"--with-qt4" "--with-qt4"
"--with-qt4-immodule" "--with-qt4-immodule"
] ]
++ optional withKde4 "--enable-kde4-applet"
++ optional withKNotify4 "--enable-notify=knotify4"
++ optional withLibnotify "--enable-notify=libnotify" ++ optional withLibnotify "--enable-notify=libnotify"
++ optional withSqlite "--with-sqlite3" ++ optional withSqlite "--with-sqlite3"
++ optionals withNetworking [ ++ optionals withNetworking [

2
pkgs/top-level/all-packages.nix
View File

@ -5091,7 +5091,7 @@ with pkgs;
uhttpmock = callPackage ../development/libraries/uhttpmock { }; uhttpmock = callPackage ../development/libraries/uhttpmock { };
uim = kde4.callPackage ../tools/inputmethods/uim { }; uim = callPackage ../tools/inputmethods/uim { };
uhub = callPackage ../servers/uhub { }; uhub = callPackage ../servers/uhub { };