propagate kdelibs4support dependencies

pkgs/applications/kde-apps-15.08/baloo-widgets.nix

@@ -23,10 +23,10 @@ kdeApp {
     ki18n
     kservice
     kfilemetadata
-    kdelibs4support
   ];
   propagatedBuildInputs = [
     baloo
+    kdelibs4support
   ];
   meta = {
     license = [ lib.licenses.lgpl21 ];

pkgs/applications/kde-apps-15.08/dolphin-plugins.nix

@@ -19,9 +19,11 @@ kdeApp {
     kxmlgui
     ki18n
     kio
-    kdelibs4support
     dolphin
   ];
+  propagatedBuildInputs = [
+    kdelibs4support
+  ];
   meta = {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/applications/kde-apps-15.08/dolphin.nix

@@ -52,11 +52,11 @@ kdeApp {
     phonon
     baloo-widgets
     kfilemetadata
-    kdelibs4support
   ];
   propagatedBuildInputs = [
     baloo
     kactivities
+    kdelibs4support
   ];
   meta = {
     license = with lib.licenses; [ gpl2 fdl12 ];

pkgs/applications/kde-apps-15.08/gwenview.nix

@@ -21,7 +21,6 @@ kdeApp {
   ];
   buildInputs = [
     exiv2
-    kdelibs4support
     kio
     lcms2
     phonon
@@ -30,6 +29,7 @@ kdeApp {
   propagatedBuildInputs = [
     baloo
     kactivities
+    kdelibs4support
     qtx11extras
   ];
   meta = {

pkgs/applications/kde-apps-15.08/konsole.nix

@@ -42,7 +42,6 @@ kdeApp {
     ki18n
     kiconthemes
     kinit
-    kdelibs4support
     kio
     knotifications
     knotifyconfig
@@ -54,6 +53,9 @@ kdeApp {
     kwindowsystem
     kxmlgui
   ];
+  propagatedBuildInputs = [
+    kdelibs4support
+  ];
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/desktops/plasma-5.4/kde-cli-tools.nix

@@ -1,31 +1,15 @@
-{ plasmaPackage
+{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig
-, extra-cmake-modules
+, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes
-, kcmutils
+, kwindowsystem, qtsvg, qtx11extras
-, kconfig
-, kdelibs4support
-, kdesu
-, kdoctools
-, ki18n
-, kiconthemes
-, kwindowsystem
-, qtsvg
-, qtx11extras
 }:
 
 plasmaPackage {
   name = "kde-cli-tools";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcmutils
+    kcmutils kconfig kdesu ki18n kiconthemes kwindowsystem
-    kconfig
-    kdelibs4support
-    kdesu
-    ki18n
-    kiconthemes
-    kwindowsystem
-    qtsvg
-    qtx11extras
   ];
+  propagatedBuildInputs = [ kdelibs4support qtsvg qtx11extras ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kmimetypefinder5"
     wrapKDEProgram "$out/bin/ksvgtopng5"

pkgs/desktops/plasma-5.4/kdeplasma-addons.nix

@@ -1,22 +1,7 @@
-{ plasmaPackage
+{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig
-, extra-cmake-modules
+, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
-, kdoctools
+, kio, knewstuff, kross, krunner, kservice, kunitconversion
-, ibus
+, plasma-framework, qtdeclarative, qtx11extras
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kcmutils
-, kdelibs4support
-, ki18n
-, kio
-, knewstuff
-, kross
-, krunner
-, kservice
-, kunitconversion
-, plasma-framework
-, qtdeclarative
-, qtx11extras
 }:
 
 plasmaPackage {
@@ -26,21 +11,8 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    ibus
+    ibus kconfig kconfigwidgets kcoreaddons kcmutils ki18n kio
-    kconfig
+    knewstuff kross krunner kservice kunitconversion plasma-framework
-    kconfigwidgets
-    kcoreaddons
-    kcmutils
-    kdelibs4support
-    ki18n
-    kio
-    knewstuff
-    kross
-    krunner
-    kservice
-    kunitconversion
-    plasma-framework
-    qtdeclarative
-    qtx11extras
   ];
+  propagatedBuildInputs = [ kdelibs4support qtdeclarative qtx11extras ];
 }

pkgs/desktops/plasma-5.4/kgamma5.nix

@@ -1,18 +1,9 @@
-{ plasmaPackage
+{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support
-, extra-cmake-modules
-, kdoctools
-, kdelibs4support
 , qtx11extras
 }:
 
 plasmaPackage {
   name = "kgamma5";
-  nativeBuildInputs = [
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    extra-cmake-modules
+  propagatedBuildInputs = [ kdelibs4support qtx11extras ];
-    kdoctools
-  ];
-  buildInputs = [
-    kdelibs4support
-    qtx11extras
-  ];
 }

pkgs/desktops/plasma-5.4/khotkeys.nix

@@ -1,16 +1,6 @@
-{ plasmaPackage
+{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
-, extra-cmake-modules
+, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
-, kdoctools
+, plasma-framework, plasma-workspace, qtx11extras
-, kcmutils
-, kdbusaddons
-, kdelibs4support
-, kglobalaccel
-, ki18n
-, kio
-, kxmlgui
-, plasma-framework
-, plasma-workspace
-, qtx11extras
 }:
 
 plasmaPackage {
@@ -20,15 +10,8 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kcmutils
+    kcmutils kdbusaddons kglobalaccel ki18n kio kxmlgui
-    kdbusaddons
+    plasma-framework plasma-workspace
-    kdelibs4support
-    kglobalaccel
-    ki18n
-    kio
-    kxmlgui
-    plasma-framework
-    plasma-workspace
-    qtx11extras
   ];
+  propagatedBuildInputs = [ kdelibs4support qtx11extras ];
 }

pkgs/desktops/plasma-5.4/kinfocenter.nix

@@ -12,10 +12,10 @@ plasmaPackage {
   ];
   buildInputs = [
     kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
-    kdbusaddons kdelibs4support ki18n kiconthemes kio kpackage
+    kdbusaddons ki18n kiconthemes kio kpackage kservice kwidgetsaddons
-    kservice kwidgetsaddons kxmlgui libraw1394 pciutils solid
+    kxmlgui libraw1394 pciutils solid
   ];
-  propagatedBuildInputs = [ kdeclarative ];
+  propagatedBuildInputs = [ kdeclarative kdelibs4support ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kinfocenter"
   '';

pkgs/desktops/plasma-5.4/kmenuedit.nix

@@ -1,13 +1,5 @@
-{ plasmaPackage
+{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui
-, extra-cmake-modules
+, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support
-, kdoctools
-, ki18n
-, kxmlgui
-, kdbusaddons
-, kiconthemes
-, kio
-, sonnet
-, kdelibs4support
 }:
 
 plasmaPackage {
@@ -17,14 +9,9 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    ki18n
+    ki18n kxmlgui kdbusaddons kiconthemes kio sonnet
-    kxmlgui
-    kdbusaddons
-    kiconthemes
-    kio
-    sonnet
-    kdelibs4support
   ];
+  propagatedBuildInputs = [ kdelibs4support ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kmenuedit"
   '';

pkgs/desktops/plasma-5.4/ksysguard.nix

@@ -1,14 +1,6 @@
-{ plasmaPackage
+{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
-, extra-cmake-modules
+, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
-, kdoctools
+, kiconthemes, libksysguard
-, kconfig
-, kcoreaddons
-, kdelibs4support
-, ki18n
-, kitemviews
-, knewstuff
-, kiconthemes
-, libksysguard
 }:
 
 plasmaPackage {
@@ -18,15 +10,10 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kconfig
+    kconfig kcoreaddons ki18n kitemviews knewstuff kiconthemes
-    kcoreaddons
-    kdelibs4support
-    ki18n
-    kitemviews
-    knewstuff
-    kiconthemes
     libksysguard
   ];
+  propagatedBuildInputs = [ kdelibs4support ];
   postInstall = ''
     wrapKDEProgram "$out/bin/ksysguardd"
     wrapKDEProgram "$out/bin/ksysguard"

pkgs/desktops/plasma-5.4/plasma-desktop/default.nix

@@ -16,15 +16,14 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    attica boost fontconfig kcmutils
+    attica boost fontconfig kcmutils kdbusaddons kded kemoticons
-    kdbusaddons kded kdelibs4support kemoticons
     kglobalaccel ki18n kitemmodels knewstuff knotifications
     knotifyconfig kpeople krunner kwallet kwin libcanberra_kde
     libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework
     plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev
     xf86inputsynaptics xkeyboard_config xinput
   ];
-  propagatedBuildInputs = [ baloo kactivities kauth kdeclarative ];
+  propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support ];
   patches = [
     (substituteAll {
       src = ./0001-hwclock.patch;

pkgs/desktops/plasma-5.4/plasma-nm.nix

@@ -14,13 +14,13 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kcompletion kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
+    kcompletion kconfigwidgets kcoreaddons kdbusaddons ki18n
-    ki18n kiconthemes kinit kio kitemviews knotifications kservice
+    kiconthemes kinit kio kitemviews knotifications kservice kwallet
-    kwallet kwidgetsaddons kwindowsystem kxmlgui
+    kwidgetsaddons kwindowsystem kxmlgui
     mobile_broadband_provider_info modemmanager-qt networkmanager-qt
-    openconnect plasma-framework qtdeclarative solid
+    openconnect plasma-framework solid
   ];
-  propagatedBuildInputs = [ kdeclarative ];
+  propagatedBuildInputs = [ kdeclarative kdelibs4support qtdeclarative ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kde5-nm-connection-editor"
   '';

pkgs/desktops/plasma-5.4/plasma-workspace/default.nix

@@ -18,14 +18,14 @@ plasmaPackage {
   ];
   buildInputs = [
     kcmutils kcrash kdbusaddons
-    kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed
+    kdesu kdewebkit kglobalaccel kidletime kjsembed
     knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets
     kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM
     libXcursor networkmanager-qt pam phonon plasma-framework qtquick1
     qtscript qtx11extras solid wayland
   ];
   propagatedBuildInputs = [
-    baloo kactivities kdeclarative libksysguard
+    baloo kactivities kdeclarative kdelibs4support libksysguard
   ];
   patches = [ ./0001-startkde-NixOS-patches.patch ];
 

pkgs/desktops/plasma-5.4/powerdevil.nix

@@ -11,9 +11,9 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kconfig kdbusaddons kdelibs4support kglobalaccel ki18n
+    kconfig kdbusaddons kglobalaccel ki18n
     kidletime kio knotifyconfig libkscreen plasma-workspace
     qtx11extras solid udev
   ];
-  propagatedBuildInputs = [ kactivities kauth ];
+  propagatedBuildInputs = [ kactivities kauth kdelibs4support ];
 }