propagate kwindowsystem dependencies

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

@@ -44,7 +44,6 @@ kdeApp {
     solid
     kiconthemes
     kcompletion
-    kwindowsystem
     knotifications
     phonon
     baloo-widgets
@@ -57,6 +56,7 @@ kdeApp {
     ki18n
     kio
     ktexteditor
+    kwindowsystem
   ];
   meta = {
     license = with lib.licenses; [ gpl2 fdl12 ];

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

@@ -41,7 +41,6 @@ kdeApp {
     kinit
     kjobwidgets
     kparts
-    kwindowsystem
     kxmlgui
     kdbusaddons
     kwallet
@@ -57,6 +56,7 @@ kdeApp {
     ki18n
     kio
     ktexteditor
+    kwindowsystem
   ];
   meta = {
     license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];

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

@@ -49,12 +49,12 @@ kdeApp {
     kservice
     ktextwidgets
     kwidgetsaddons
-    kwindowsystem
     kxmlgui
   ];
   propagatedBuildInputs = [
     kdelibs4support
     ki18n
+    kwindowsystem
   ];
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

pkgs/applications/kde-apps-15.08/print-manager.nix

@@ -32,12 +32,12 @@ kdeApp {
     knotifications
     plasma-framework
     kwidgetsaddons
-    kwindowsystem
     kitemviews
   ];
   propagatedBuildInputs = [
     ki18n
     kio
+    kwindowsystem
     qtdeclarative
   ];
   meta = {

pkgs/desktops/plasma-5.4/breeze-qt5.nix

@@ -11,9 +11,8 @@ plasmaPackage {
   ];
   buildInputs = [
     kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
-    kwindowsystem qtx11extras
   ];
-  propagatedBuildInputs = [ frameworkintegration ki18n ];
+  propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
   cmakeFlags = [ "-DUSE_KDE4=OFF" ];
   postInstall = ''
     wrapKDEProgram "$out/bin/breeze-settings5"

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

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

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

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

pkgs/desktops/plasma-5.4/libksysguard.nix

@@ -11,10 +11,9 @@ plasmaPackage {
   ];
   buildInputs = [
     kcompletion kconfigwidgets kcoreaddons kservice
-    kwidgetsaddons kwindowsystem plasma-framework qtscript qtwebkit
+    kwidgetsaddons plasma-framework qtscript qtwebkit
-    qtx11extras
   ];
   propagatedBuildInputs = [
-    kauth kconfig ki18n kiconthemes
+    kauth kconfig ki18n kiconthemes kwindowsystem qtx11extras
   ];
 }

pkgs/desktops/plasma-5.4/oxygen.nix

@@ -10,9 +10,9 @@ plasmaPackage {
   ];
   buildInputs = [
     kcmutils kconfig kdecoration kguiaddons kwidgetsaddons
-    kservice kcompletion kwindowsystem qtx11extras
+    kservice kcompletion
   ];
-  propagatedBuildInputs = [ frameworkintegration ki18n ];
+  propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
   postInstall = ''
     wrapKDEProgram "$out/bin/oxygen-demo5"
     wrapKDEProgram "$out/bin/oxygen-settings5"

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

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

pkgs/desktops/plasma-5.4/polkit-kde-agent.nix

@@ -18,7 +18,6 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    kwindowsystem
     kdbusaddons
     kwidgetsaddons
     kcoreaddons
@@ -28,5 +27,5 @@ plasmaPackage {
     knotifications
     polkitQt
   ];
-  propagatedBuildInputs = [ ki18n ];
+  propagatedBuildInputs = [ ki18n kwindowsystem ];
 }

pkgs/desktops/plasma-5.4/systemsettings.nix

@@ -10,10 +10,10 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kitemviews kcmutils kservice kiconthemes kwindowsystem
+    kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons
-    kxmlgui kdbusaddons kconfig
+    kconfig
   ];
-  propagatedBuildInputs = [ khtml ki18n kio ];
+  propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ];
   postInstall = ''
     wrapKDEProgram "$out/bin/systemsettings5"
   '';

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

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

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

@@ -8,7 +8,8 @@
 kdeFramework {
   name = "kcrash";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
+  buildInputs = [ kcoreaddons ];
+  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

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

@@ -6,7 +6,7 @@
 kdeFramework {
   name = "kdbusaddons";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
+  propagatedBuildInputs = [ qtx11extras ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kquitapp5"
   '';

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

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

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

@@ -11,7 +11,8 @@
 kdeFramework {
   name = "kglobalaccel";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras ];
+  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
+  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kglobalaccel5"
   '';

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

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

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

@@ -8,8 +8,8 @@
 kdeFramework {
   name = "kinit";
   nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
-  buildInputs = [ kconfig kcrash kservice kwindowsystem libcap ];
+  buildInputs = [ kconfig kcrash kservice libcap ];
-  propagatedBuildInputs = [ ki18n kio ];
+  propagatedBuildInputs = [ ki18n kio kwindowsystem ];
   patches = [ ./0001-kinit-libpath.patch ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

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

@@ -11,12 +11,12 @@ kdeFramework {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
-    knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem
+    knotifications ktextwidgets kwallet kwidgetsaddons
     qtscript
   ];
   propagatedBuildInputs = [
     kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
-    kservice kxmlgui solid qtx11extras
+    kservice kwindowsystem kxmlgui solid qtx11extras
   ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kcookiejar5"

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

@@ -8,7 +8,8 @@
 kdeFramework {
   name = "kjobwidgets";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
+  buildInputs = [ kcoreaddons kwidgetsaddons ];
+  propagatedBuildInputs = [ qtx11extras ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

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

@@ -12,9 +12,9 @@ kdeFramework {
   name = "knotifications";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kcodecs kconfig kcoreaddons kwindowsystem
+    kcodecs kconfig kcoreaddons phonon
-    phonon qtx11extras
   ];
+  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

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

@@ -6,8 +6,8 @@ kdeFramework {
   name = "kservice";
   setupHook = ./setup-hook.sh;
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcoreaddons kcrash kdbusaddons kwindowsystem ];
+  buildInputs = [ kcoreaddons kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kconfig ki18n ];
+  propagatedBuildInputs = [ kconfig ki18n kwindowsystem ];
   patches = [
     ./kservice-kbuildsycoca-follow-symlinks.patch
     ./kservice-kbuildsycoca-no-canonicalize-path.patch

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

@@ -7,9 +7,9 @@ kdeFramework {
   name = "ktextwidgets";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem
+    kcompletion kconfig kconfigwidgets kiconthemes kservice
   ];
-  propagatedBuildInputs = [ ki18n sonnet ];
+  propagatedBuildInputs = [ ki18n kwindowsystem sonnet ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

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

@@ -8,9 +8,9 @@ kdeFramework {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kconfig kcoreaddons kdbusaddons kiconthemes knotifications
-    kservice kwidgetsaddons kwindowsystem libgcrypt
+    kservice kwidgetsaddons libgcrypt
   ];
-  propagatedBuildInputs = [ ki18n ];
+  propagatedBuildInputs = [ ki18n kwindowsystem ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kwalletd5"
     wrapKDEProgram "$out/bin/kwallet-query"

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

@@ -8,9 +8,9 @@ kdeFramework {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     attica kconfig kconfigwidgets kiconthemes kitemviews
-    ktextwidgets kwindowsystem sonnet
+    ktextwidgets sonnet
   ];
-  propagatedBuildInputs = [ kglobalaccel ki18n ];
+  propagatedBuildInputs = [ kglobalaccel ki18n kwindowsystem ];
   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 kguiaddons
-    kiconthemes knotifications kwindowsystem kxmlgui qtscript
+    kiconthemes knotifications kxmlgui qtscript
   ];
   propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice
+    kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem
     qtx11extras
   ];
   postInstall = ''