propagate kactivities dependencies

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

@@ -49,7 +49,6 @@ kdeApp {
     ktexteditor
     kwindowsystem
     knotifications
-    kactivities
     phonon
     baloo-widgets
     kfilemetadata
@@ -57,6 +56,7 @@ kdeApp {
   ];
   propagatedBuildInputs = [
     baloo
+    kactivities
   ];
   meta = {
     license = with lib.licenses; [ gpl2 fdl12 ];

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

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

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

@@ -34,7 +34,6 @@ kdeApp {
   ];
   buildInputs = [
     qtscript
-    kactivities
     kconfig
     kcrash
     kguiaddons
@@ -56,6 +55,9 @@ kdeApp {
     knewstuff
     libgit2
   ];
+  propagatedBuildInputs = [
+    kactivities
+  ];
   meta = {
     license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];

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

@@ -1,39 +1,10 @@
-{ plasmaPackage
+{ plasmaPackage, extra-cmake-modules, kdoctools, epoxy
-, extra-cmake-modules
+, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets
-, kdoctools
+, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel
-, epoxy
+, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications
-, kactivities
+, kpackage, kservice, kwayland, kwidgetsaddons, kwindowsystem
-, kcompletion
+, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative
-, kcmutils
+, qtscript, qtx11extras, udev, wayland, xcb-util-cursor
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kcrash
-, kdeclarative
-, 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
 }:
 
 plasmaPackage {
@@ -43,40 +14,14 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    epoxy
+    epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
-    kactivities
+    kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
-    kcompletion
+    kinit kio knewstuff knotifications kpackage kservice kwayland
-    kcmutils
+    kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM
-    kconfig
+    plasma-framework qtdeclarative qtscript qtx11extras udev wayland
-    kconfigwidgets
-    kcoreaddons
-    kcrash
-    kdeclarative
-    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 ];
   patches = [ ./kwin-import-plugin-follow-symlinks.patch ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kwin_x11"

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

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

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

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

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

@@ -17,7 +17,7 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kactivities kcmutils kcrash kdbusaddons kdeclarative
+    kcmutils kcrash kdbusaddons kdeclarative
     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 libksysguard
+    baloo kactivities libksysguard
   ];
   patches = [ ./0001-startkde-NixOS-patches.patch ];
 

pkgs/desktops/plasma-5.4/powerdevil.nix

@@ -1,21 +1,7 @@
-{ plasmaPackage
+{ plasmaPackage, extra-cmake-modules, kdoctools, kactivities
-, extra-cmake-modules
+, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
-, kdoctools
+, kidletime, kio, knotifyconfig, libkscreen, plasma-workspace
-, kactivities
+, qtx11extras, solid, udev
-, kauth
-, kconfig
-, kdbusaddons
-, kdelibs4support
-, kglobalaccel
-, ki18n
-, kidletime
-, kio
-, knotifyconfig
-, libkscreen
-, plasma-workspace
-, qtx11extras
-, solid
-, udev
 }:
 
 plasmaPackage {
@@ -25,20 +11,9 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kactivities
+    kauth kconfig kdbusaddons kdelibs4support kglobalaccel ki18n
-    kauth
+    kidletime kio knotifyconfig libkscreen plasma-workspace
-    kconfig
+    qtx11extras solid udev
-    kdbusaddons
-    kdelibs4support
-    kglobalaccel
-    ki18n
-    kidletime
-    kio
-    knotifyconfig
-    libkscreen
-    plasma-workspace
-    qtx11extras
-    solid
-    udev
   ];
+  propagatedBuildInputs = [ kactivities ];
 }

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

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