kde414: build with kdelibs-4.14.12

Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.

6 files changed, 30 insertions, 29 deletions

diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix
index 55260b269c6d..606595f46057 100644
--- a/pkgs/tools/misc/colord-kde/default.nix
+++ b/pkgs/tools/misc/colord-kde/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, cmake, colord, libX11, libXrandr, lcms2, pkgconfig, kdelibs}:
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
+, colord, libX11, libXrandr, lcms2, kdelibs
+}:
 
 stdenv.mkDerivation {
   name = "colord-kde-0.3.0";
@@ -8,7 +10,9 @@ stdenv.mkDerivation {
     sha256 = "ab3cdb7c8c98aa2ee8de32a92f87770e1fbd58eade6471f3f24d932b50b4cf09";
   };
 
-  buildInputs = [ cmake colord libX11 libXrandr lcms2 pkgconfig kdelibs ];
+  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+
+  buildInputs = [ colord libX11 libXrandr lcms2 kdelibs ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix
index 88df0b6b5445..809d0c65c6ec 100644
--- a/pkgs/tools/misc/kde-gtk-config/default.nix
+++ b/pkgs/tools/misc/kde-gtk-config/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, cmake, gettext, gtk2, gtk3, kdelibs
-, libxcb, libpthreadstubs, libXdmcp, pkgconfig, glib, gdk_pixbuf }:
+{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
+, gtk2, gtk3, kdelibs, libxcb, libpthreadstubs, libXdmcp
+, glib, gdk_pixbuf
+}:
 
 stdenv.mkDerivation {
   name = "kde-gtk-config-2.2.1";
@@ -9,19 +11,11 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    cmake
-    gdk_pixbuf
-    gettext
-    glib
-    gtk2
-    gtk3
-    kdelibs
-    libxcb
-    libpthreadstubs
-    libXdmcp
-    pkgconfig
+    gdk_pixbuf glib gtk2 gtk3 kdelibs libxcb libpthreadstubs libXdmcp
   ];
 
+  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
+
   patches = [
     ./kde-gtk-config-2.2.1-install-paths.patch
     ./kde-gtk-config-follow-symlinks.patch
diff --git a/pkgs/tools/networking/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix
index 5d07e6c26ec4..17f809ddb8c9 100644
--- a/pkgs/tools/networking/plasma-nm/default.nix
+++ b/pkgs/tools/networking/plasma-nm/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, cmake, gettext, kdelibs, networkmanager, libnm-qt }:
+{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
+, kdelibs, networkmanager, libnm-qt }:
 
 let
   pname = "plasma-nm";
@@ -13,14 +14,9 @@ stdenv.mkDerivation {
     sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751";
   };
 
-  buildInputs = [
-    cmake
-    pkgconfig
-    gettext
-    kdelibs
-    networkmanager
-    libnm-qt
-  ];
+  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
+
+  buildInputs = [ kdelibs networkmanager libnm-qt ];
 
   meta = with stdenv.lib; {
     homepage = "https://projects.kde.org/projects/kde/workspace/plasma-nm";
diff --git a/pkgs/tools/security/ksshaskpass/default.nix b/pkgs/tools/security/ksshaskpass/default.nix
index 1c777294c9bb..a668f57c5bbe 100644
--- a/pkgs/tools/security/ksshaskpass/default.nix
+++ b/pkgs/tools/security/ksshaskpass/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, kdelibs}:
+{ stdenv, fetchurl, kdelibs
+, automoc4, cmake, perl, pkgconfig
+}:
 
 stdenv.mkDerivation {
   name = "ksshaskpass-0.5.3";
@@ -8,6 +10,8 @@ stdenv.mkDerivation {
     sha256 = "0911i8jr0nzqah8xidb8wba55a2skaidj3klv3cw6bm5fjx7x953";
   };
 
+  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+
   buildInputs = [ kdelibs ];
 
   patchPhase = ''
diff --git a/pkgs/tools/security/polkit-kde-agent/default.nix b/pkgs/tools/security/polkit-kde-agent/default.nix
index b3990b53a87a..6b4bcf7ad637 100644
--- a/pkgs/tools/security/polkit-kde-agent/default.nix
+++ b/pkgs/tools/security/polkit-kde-agent/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, kdelibs, polkit_qt4, gettext }:
+{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
+, kdelibs, polkit_qt4 }:
 
 stdenv.mkDerivation rec {
   name = "polkit-kde-agent-1-0.99.0";
@@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ kdelibs polkit_qt4 ];
 
-  nativeBuildInputs = [ gettext ];
+  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
 
   patchPhase = "sed -e s/KDE4_AUTOSTART/AUTOSTART/ -i CMakeLists.txt";
 
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index eb8db0a44a5f..664fb87b5205 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, cmake, kdelibs, gettext }:
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
+, kdelibs, gettext
+}:
 
 stdenv.mkDerivation rec {
   name = "kdiff3-0.9.98";
@@ -8,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ kdelibs ];
-  nativeBuildInputs = [ cmake gettext ];
+  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
 
   meta = {
     homepage = http://kdiff3.sourceforge.net/;