kde4.kdelibs -> kdelibs4

Our kdelibs4 package does not come from KDE 4, so per upstream's request I am
moving it out of the kde4 set.

4 files changed, 10 insertions, 10 deletions

diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 99107787493..ad9cb9e5ff0 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, lcms2, libpng, eigen
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen
 , exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
 , libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
 , freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
 
   buildInputs = [
-    kdelibs lcms2 libpng eigen
+    kdelibs4 lcms2 libpng eigen
     exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
     libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
     freetds fftw glew libkdcraw opencolorio kdepimlibs
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://calligra.org;
     maintainers = with maintainers; [ urkud phreedom ebzzry ];
-    inherit (kdelibs.meta) platforms;
+    inherit (kdelibs4.meta) platforms;
     license = licenses.gpl2;
   };
 }
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 989cf17e276..f583660c623 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,7 +6,7 @@
 , openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
@@ -252,7 +252,7 @@ in stdenv.mkDerivation rec {
       libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
       gdb
     ]
-    ++ lib.optional kdeIntegration kde4.kdelibs;
+    ++ lib.optional kdeIntegration kdelibs4;
 
   passthru = {
     inherit srcs;
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 26bb53c9b38..329b292da27 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -6,7 +6,7 @@
 , openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus_glib, glibc, qt4, kdelibs4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
@@ -247,7 +247,7 @@ in stdenv.mkDerivation rec {
       librevenge libe-book libmwaw glm glew ncurses
       libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
     ]
-    ++ lib.optional kdeIntegration kde4.kdelibs;
+    ++ lib.optional kdeIntegration kdelibs4;
 
   passthru = {
     inherit srcs;
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index a16ab1baef4..71f38bb8d3c 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, kdepimlibs, boost, baloo }:
+, kdelibs4, kdepimlibs, boost, baloo }:
 
 stdenv.mkDerivation rec {
   name = "zanshin-0.3.1";
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
 
-  buildInputs = [ kdelibs kdepimlibs boost baloo ];
+  buildInputs = [ kdelibs4 kdepimlibs boost baloo ];
 
   meta = {
     description = "GTD for KDE";
     maintainers = [ stdenv.lib.maintainers.urkud ];
-    inherit (kdelibs.meta) platforms;
+    inherit (kdelibs4.meta) platforms;
   };
 }