propagate kdeclarative dependencies

pkgs/desktops/plasma-5.4/kinfocenter.nix

@@ -1,24 +1,7 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, kcmutils
-, kcompletion
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdbusaddons
-, kdeclarative
-, kdelibs4support
-, ki18n
-, kiconthemes
-, kio
-, kpackage
-, kservice
-, kwidgetsaddons
-, kxmlgui
-, libraw1394
-, pciutils
-, solid
+{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
+, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons
+, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage
+, kservice, kwidgetsaddons, kxmlgui, libraw1394, pciutils, solid
 }:
 
 plasmaPackage {
@@ -28,25 +11,11 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kcmutils
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kdbusaddons
-    kdeclarative
-    kdelibs4support
-    ki18n
-    kiconthemes
-    kio
-    kpackage
-    kservice
-    kwidgetsaddons
-    kxmlgui
-    libraw1394
-    pciutils
-    solid
+    kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
+    kdbusaddons kdelibs4support ki18n kiconthemes kio kpackage
+    kservice kwidgetsaddons kxmlgui libraw1394 pciutils solid
   ];
+  propagatedBuildInputs = [ kdeclarative ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kinfocenter"
   '';

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

@@ -15,13 +15,13 @@ plasmaPackage {
   ];
   buildInputs = [
     epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
-    kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
+    kcrash kdecoration kglobalaccel ki18n kiconthemes
     kinit kio knewstuff knotifications kpackage kservice kwayland
     kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM
     plasma-framework qtdeclarative qtscript qtx11extras udev wayland
     xcb-util-cursor
   ];
-  propagatedBuildInputs = [ kactivities ];
+  propagatedBuildInputs = [ kactivities kdeclarative ];
   patches = [ ./kwin-import-plugin-follow-symlinks.patch ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kwin_x11"

pkgs/desktops/plasma-5.4/milou.nix

@@ -1,12 +1,5 @@
-{ plasmaPackage
-, extra-cmake-modules
-, qtscript
-, qtdeclarative
-, kcoreaddons
-, ki18n
-, kdeclarative
-, kservice
-, plasma-framework
+{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative
+, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
 , krunner
 }:
 
@@ -16,13 +9,7 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    qtscript
-    qtdeclarative
-    kcoreaddons
-    ki18n
-    kdeclarative
-    kservice
-    plasma-framework
-    krunner
+    qtscript kcoreaddons ki18n kservice plasma-framework krunner
   ];
+  propagatedBuildInputs = [ kdeclarative qtdeclarative ];
 }

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

@@ -17,14 +17,14 @@ plasmaPackage {
   ];
   buildInputs = [
     attica boost fontconfig kcmutils
-    kdbusaddons kdeclarative kded kdelibs4support 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 ];
+  propagatedBuildInputs = [ baloo kactivities kauth kdeclarative ];
   patches = [
     (substituteAll {
       src = ./0001-hwclock.patch;

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

@@ -10,9 +10,9 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    kconfig kcoreaddons kdeclarative kguiaddons ki18n kio
+    kconfig kcoreaddons kguiaddons ki18n kio
     kservice kfilemetadata plasma-framework qtdeclarative qtmultimedia
     taglib
   ];
-  propagatedBuildInputs = [ baloo kactivities ];
+  propagatedBuildInputs = [ baloo kactivities kdeclarative ];
 }

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

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

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

@@ -1,12 +1,5 @@
-{ plasmaPackage
-, extra-cmake-modules
-, glib
-, kconfigwidgets
-, kcoreaddons
-, kdeclarative
-, kglobalaccel
-, ki18n
-, libpulseaudio
+{ plasmaPackage, extra-cmake-modules, glib, kconfigwidgets
+, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio
 , plasma-framework
 }:
 
@@ -16,13 +9,8 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    glib
-    kconfigwidgets
-    kcoreaddons
-    kdeclarative
-    kglobalaccel
-    ki18n
-    libpulseaudio
+    glib kconfigwidgets kcoreaddons kglobalaccel ki18n libpulseaudio
     plasma-framework
   ];
+  propagatedBuildInputs = [ kdeclarative ];
 }

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

@@ -17,7 +17,7 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kcmutils kcrash kdbusaddons kdeclarative
+    kcmutils kcrash kdbusaddons
     kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed
     knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets
     kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM
@@ -25,7 +25,7 @@ plasmaPackage {
     qtscript qtx11extras solid wayland
   ];
   propagatedBuildInputs = [
-    baloo kactivities libksysguard
+    baloo kactivities kdeclarative libksysguard
   ];
   patches = [ ./0001-startkde-NixOS-patches.patch ];
 

pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix

@@ -1,38 +1,16 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, boost
-, kcmutils
-, kconfig
-, kcoreaddons
-, kdbusaddons
-, kdeclarative
-, kglobalaccel
-, ki18n
-, kio
-, kservice
-, kwindowsystem
-, kxmlgui
-, qtdeclarative
+{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
+, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
+, kio, kservice, kwindowsystem, kxmlgui, qtdeclarative
 }:
 
 kdeFramework {
   name = "kactivities";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    boost
-    kcmutils
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    kdeclarative
-    kglobalaccel
-    ki18n
-    kio
-    kservice
-    kwindowsystem
-    kxmlgui
-    qtdeclarative
+    boost kcmutils kconfig kcoreaddons kdbusaddons kglobalaccel ki18n
+    kio kservice kwindowsystem kxmlgui
   ];
+  propagatedBuildInputs = [ kdeclarative qtdeclarative ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kactivitymanagerd"
   '';

pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix

@@ -1,29 +1,15 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfigwidgets
-, kcoreaddons
-, kdeclarative
-, ki18n
-, kiconthemes
-, kitemviews
-, kpackage
-, kservice
-, kxmlgui
+{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
+, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
+, kpackage, kservice, kxmlgui
 }:
 
 kdeFramework {
   name = "kcmutils";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kcoreaddons
-    kdeclarative
-    ki18n
-    kiconthemes
-    kitemviews
-    kpackage
-    kxmlgui
+    kcoreaddons ki18n kiconthemes kitemviews kpackage kxmlgui
   ];
-  propagatedBuildInputs = [ kconfigwidgets kservice ];
+  propagatedBuildInputs = [ kconfigwidgets kdeclarative kservice ];
   patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix

@@ -10,10 +10,10 @@ kdeFramework {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     karchive kconfig kconfigwidgets kcoreaddons
-    kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes
+    kdbusaddons kglobalaccel kguiaddons ki18n kiconthemes
     kio knotifications kwindowsystem kxmlgui qtscript qtx11extras
   ];
-  propagatedBuildInputs = [ kactivities kpackage kservice ];
+  propagatedBuildInputs = [ kactivities kdeclarative kpackage kservice ];
   postInstall = ''
     wrapKDEProgram "$out/bin/plasmapkg2"
   '';