diff --git a/pkgs/desktops/kde-4.10/kde-runtime.nix b/pkgs/desktops/kde-4.10/kde-runtime.nix index a0e58deb0b2..6b642eb0b22 100644 --- a/pkgs/desktops/kde-4.10/kde-runtime.nix +++ b/pkgs/desktops/kde-4.10/kde-runtime.nix @@ -1,11 +1,11 @@ { kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio -, networkmanager, nepomuk_core, kactivities, kdepimlibs +, networkmanager, kactivities, kdepimlibs }: kde { buildInputs = [ - kdelibs attica xz bzip2 nepomuk_core libssh libjpeg exiv2 ntrack + kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack qca2 samba (libcanberra.override { gtk = null; }) pulseaudio networkmanager kactivities kdepimlibs #todo: add openslp, openexr diff --git a/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix index fa140765e7f..571674a461a 100644 --- a/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix +++ b/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix @@ -1,5 +1,5 @@ -{ kde, kdelibs, kdepimlibs, nepomuk_core }: +{ kde, kdelibs, kdepimlibs }: kde { - buildInputs = [ kdelibs kdepimlibs nepomuk_core]; + buildInputs = [ kdelibs kdepimlibs ]; } diff --git a/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix index 65a7c7ffe7e..7f6973c054b 100644 --- a/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix @@ -1,5 +1,5 @@ { kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, - nepomuk_core, polkit_qt_1, boost, lndir, pkgconfig }: + polkit_qt_1, boost, lndir, pkgconfig }: let pydir = "lib/python${python.majorVersion}"; in @@ -9,7 +9,7 @@ kde { buildInputs = [ python kdepimlibs shared_desktop_ontologies - boost nepomuk_core polkit_qt_1 pkgconfig + boost polkit_qt_1 pkgconfig ]; propagatedBuildInputs = [ pyqt4 sip ]; diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix index e7e5101c972..d129686b2de 100644 --- a/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix +++ b/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix @@ -1,5 +1,5 @@ { kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular -, shared_desktop_ontologies, attica, nepomuk_core }: +, shared_desktop_ontologies, attica }: kde { # attica, akonadi and kdepimlibs are disabled due to smokegen crash diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix index 1d401aca021..3907b67c42a 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix @@ -1,14 +1,14 @@ { kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent, jasper, libidn, mediastreamer, msilbc, pkgconfig, libxslt, giflib, libgadu, boost, qca2, gpgme, sqlite, telepathy_qt, shared_desktop_ontologies, - libjpeg, nepomuk_core, libmms }: + libjpeg, libmms }: kde { #todo: libmeanwhile, xmms buildInputs = [ kdelibs telepathy_qt shared_desktop_ontologies qca2 gpgme libgadu mediastreamer kdepimlibs qimageblitz libktorrent libjpeg sqlite jasper giflib libmsn libotr - libxslt libidn speex nepomuk_core boost libmms msilbc + libxslt libidn speex boost libmms msilbc ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/kde-4.10/kdepim-runtime.nix b/pkgs/desktops/kde-4.10/kdepim-runtime.nix index 191ce1080b8..8fdd9fc8fa1 100644 --- a/pkgs/desktops/kde-4.10/kdepim-runtime.nix +++ b/pkgs/desktops/kde-4.10/kdepim-runtime.nix @@ -1,10 +1,10 @@ { kde, fetchurl, cmake, kdelibs, libxslt, boost, kdepimlibs, akonadi -, shared_desktop_ontologies, nepomuk_core }: +, shared_desktop_ontologies }: kde { buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies - libxslt nepomuk_core + libxslt ]; #todo: libkgapi, libkolab, libkolabxml meta = { diff --git a/pkgs/desktops/kde-4.10/kdepim.nix b/pkgs/desktops/kde-4.10/kdepim.nix index 56d18eab185..fffab0010e3 100644 --- a/pkgs/desktops/kde-4.10/kdepim.nix +++ b/pkgs/desktops/kde-4.10/kdepim.nix @@ -1,11 +1,11 @@ { kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime , akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison -, nepomuk_core, nepomuk_widgets, dblatex }: +, nepomuk_widgets, dblatex }: kde { #todo: update grantlee to 0.3 buildInputs = - [ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_core nepomuk_widgets + [ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_widgets libxslt cyrus_sasl gpgme libassuan grantlee prison dblatex ]; diff --git a/pkgs/desktops/kde-4.10/kdepimlibs.nix b/pkgs/desktops/kde-4.10/kdepimlibs.nix index 27ec1de5a61..c9813b19f52 100644 --- a/pkgs/desktops/kde-4.10/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.10/kdepimlibs.nix @@ -4,11 +4,11 @@ kde { buildInputs = - [ boost gpgme libical libxslt nepomuk_core qjson + [ boost gpgme libical libxslt qjson openldap cyrus_sasl akonadi shared_desktop_ontologies ]; - propagatedBuildInputs = [ kdelibs ]; + propagatedBuildInputs = [ kdelibs nepomuk_core ]; meta = { description = "KDE PIM libraries"; diff --git a/pkgs/desktops/kde-4.10/kdeplasma-addons.nix b/pkgs/desktops/kde-4.10/kdeplasma-addons.nix index 3b30a257ddf..2bd6f5037db 100644 --- a/pkgs/desktops/kde-4.10/kdeplasma-addons.nix +++ b/pkgs/desktops/kde-4.10/kdeplasma-addons.nix @@ -1,7 +1,7 @@ { kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig , boost, eigen, kde_workspace, attica, python, qca2, qimageblitz , kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt -, qjson, qoauth, nepomuk_core }: +, qjson, qoauth }: # TODO: qwt, scim, ibus kde { @@ -9,7 +9,7 @@ kde { KDEDIRS=marble; buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth - eigen qca2 libXtst qimageblitz nepomuk_core + eigen qca2 libXtst qimageblitz libqalculate shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt ]; diff --git a/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix index 3027e2357a4..f3b00a5b968 100644 --- a/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix +++ b/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, kdepimlibs, nepomuk_core }: +{ kde, kdelibs, kdepimlibs }: kde { - buildInputs = [ kdelibs kdepimlibs nepomuk_core ]; + buildInputs = [ kdelibs kdepimlibs ]; meta = { description = "Simple KDE GUI for GPG"; diff --git a/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix index 09f409cc474..21971beb80a 100644 --- a/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix +++ b/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix @@ -1,9 +1,9 @@ -{ kde, kdelibs, libxml2, libxslt, kdepimlibs, nepomuk_core, htmlTidy, boost }: +{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }: kde { #todo: ruby is not found. needed for some example scripts buildInputs = - [ kdelibs kdepimlibs htmlTidy nepomuk_core boost ]; + [ kdelibs kdepimlibs htmlTidy boost ]; meta = { description = "A KDE link checker";