propagate kglobalaccel dependencies

pkgs/desktops/plasma-5.4/khotkeys.nix

@@ -5,13 +5,10 @@
 
 plasmaPackage {
   name = "khotkeys";
-  nativeBuildInputs = [
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    extra-cmake-modules
-    kdoctools
-  ];
   buildInputs = [
-    kcmutils kdbusaddons kglobalaccel ki18n kio kxmlgui
+    kcmutils kdbusaddons ki18n kio kxmlgui plasma-framework
-    plasma-framework plasma-workspace
+    plasma-workspace
   ];
-  propagatedBuildInputs = [ kdelibs4support qtx11extras ];
+  propagatedBuildInputs = [ kdelibs4support kglobalaccel qtx11extras ];
 }

pkgs/desktops/plasma-5.4/kscreen.nix

@@ -1,14 +1,6 @@
-{ plasmaPackage
+{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets
-, extra-cmake-modules
+, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
-, kconfig
+, libkscreen, qtdeclarative
-, kconfigwidgets
-, kdbusaddons
-, kglobalaccel
-, ki18n
-, kwidgetsaddons
-, kxmlgui
-, libkscreen
-, qtdeclarative
 }:
 
 plasmaPackage {
@@ -17,16 +9,10 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    kconfig
+    kconfig kconfigwidgets kdbusaddons ki18n kwidgetsaddons kxmlgui
-    kconfigwidgets
-    kdbusaddons
-    kglobalaccel
-    ki18n
-    kwidgetsaddons
-    kxmlgui
     libkscreen
-    qtdeclarative
   ];
+  propagatedBuildInputs = [ kglobalaccel qtdeclarative ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kscreen-console"
   '';

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

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

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

@@ -17,7 +17,7 @@ plasmaPackage {
   ];
   buildInputs = [
     attica boost fontconfig kcmutils kdbusaddons kded
-    kglobalaccel ki18n kitemmodels knewstuff knotifications
+    ki18n kitemmodels knewstuff knotifications
     knotifyconfig kpeople krunner kwallet kwin libcanberra_kde
     libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework
     plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev
@@ -25,6 +25,7 @@ plasmaPackage {
   ];
   propagatedBuildInputs = [
     baloo kactivities kauth kdeclarative kdelibs4support kemoticons
+    kglobalaccel
   ];
   patches = [
     (substituteAll {

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

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

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

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

pkgs/desktops/plasma-5.4/powerdevil.nix

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

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

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

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

@@ -18,9 +18,9 @@ kdeFramework {
   name = "kdeclarative";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem
+    epoxy kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem
   ];
-  propagatedBuildInputs = [ kconfig kpackage qtdeclarative ];
+  propagatedBuildInputs = [ kconfig kglobalaccel kpackage qtdeclarative ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kpackagelauncherqml"
   '';

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

@@ -13,14 +13,14 @@ kdeFramework {
   name = "kdelibs4support";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcompletion kconfig kglobalaccel ki18n kio kservice kwidgetsaddons
+    kcompletion kconfig ki18n kio kservice kwidgetsaddons
     kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
   ];
   propagatedBuildInputs = [
     kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kguiaddons kiconthemes kitemmodels
+    kdesignerplugin kemoticons kglobalaccel kguiaddons kiconthemes
-    kinit knotifications kparts ktextwidgets kunitconversion
+    kitemmodels kinit knotifications kparts ktextwidgets
-    kwindowsystem
+    kunitconversion kwindowsystem
   ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"

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

@@ -1,34 +1,19 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
-, extra-cmake-modules
+, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
-, giflib
+, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
-, karchive
+, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
-, kcodecs
-, kglobalaccel
-, ki18n
-, kiconthemes
-, kio
-, kjs
-, knotifications
-, kparts
-, ktextwidgets
-, kwallet
-, kwidgetsaddons
-, kwindowsystem
-, kxmlgui
-, perl
-, phonon
-, qtx11extras
-, sonnet
 }:
 
 kdeFramework {
   name = "khtml";
   nativeBuildInputs = [ extra-cmake-modules perl ];
   buildInputs = [
-    giflib karchive kglobalaccel kiconthemes knotifications kwallet
+    giflib karchive kiconthemes knotifications kwallet kwidgetsaddons
-    kwidgetsaddons kwindowsystem kxmlgui phonon qtx11extras sonnet
+    kwindowsystem kxmlgui phonon qtx11extras sonnet
+  ];
+  propagatedBuildInputs = [
+    kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets
   ];
-  propagatedBuildInputs = [ kcodecs ki18n kio kjs kparts ktextwidgets ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

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

@@ -1,24 +1,16 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
-, extra-cmake-modules
+, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
-, attica
+, ktextwidgets, kwindowsystem, sonnet
-, kconfig
-, kconfigwidgets
-, kglobalaccel
-, ki18n
-, kiconthemes
-, kitemviews
-, ktextwidgets
-, kwindowsystem
-, sonnet
 }:
 
 kdeFramework {
   name = "kxmlgui";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes
+    attica kconfig kconfigwidgets ki18n kiconthemes kitemviews
-    kitemviews ktextwidgets kwindowsystem sonnet
+    ktextwidgets kwindowsystem sonnet
   ];
+  propagatedBuildInputs = [ kglobalaccel ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

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

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