kdeFrameworks: fixup inputs and outputs

- Reduce environment pollution with a separate $bin output containing programs,
  plugins, and shared data. Libraries remain in $out and are not installed into
  the environment.
- Only propagate build inputs as required.

nixos/modules/services/x11/desktop-managers/plasma5.nix

@@ -52,8 +52,8 @@ in
       };
 
       security.wrappers = {
-        kcheckpass.source = "${plasma5.plasma-workspace.out}/lib/libexec/kcheckpass";
+        kcheckpass.source = "${lib.getBin plasma5.plasma-workspace}/lib/libexec/kcheckpass";
-        "start_kdeinit".source = "${pkgs.kinit.out}/lib/libexec/kf5/start_kdeinit";
+        "start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit";
       };
 
       environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications;

pkgs/applications/kde/akonadi-contacts.nix

@@ -1,8 +1,8 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine,
+  akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes,
-  akonadi
+  kio, kitemmodels, kmime, ktextwidgets, qtwebengine,
 }:
 
 mkDerivation {
@@ -13,7 +13,9 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine
+    akonadi-mime grantlee kcontacts kdbusaddons ki18n kiconthemes kio
+    kitemmodels kmime ktextwidgets qtwebengine
   ];
   propagatedBuildInputs = [ akonadi ];
+  outputs = [ "out" "dev" ];
 }

pkgs/applications/kde/akonadi-mime.nix

@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  akonadi, kdbusaddons, kio, kitemmodels, kmime
+  akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime
 }:
 
 mkDerivation {
@@ -11,5 +11,6 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ];
+  buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
+  outputs = [ "out" "dev" ];
 }

pkgs/applications/kde/ark/default.nix

@@ -3,8 +3,8 @@
 
   extra-cmake-modules, kdoctools,
 
-  karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
+  karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, kitemmodels,
-  kservice, kpty, kwidgetsaddons, libarchive, kitemmodels,
+  khtml, kio, kparts, kpty, kservice, kwidgetsaddons, libarchive,
 
   # Archive tools
   p7zip, unzipNLS, zip,
@@ -17,9 +17,10 @@ mkDerivation {
   name = "ark";
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
   propagatedBuildInputs = [
-    khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
+    karchive kconfig kcrash kdbusaddons khtml ki18n kiconthemes kio kitemmodels
-    kpty kwidgetsaddons libarchive kitemmodels
+    kparts kpty kservice kwidgetsaddons libarchive
   ];
+  outputs = [ "out" "dev" ];
   postFixup =
     let
       PATH =

pkgs/applications/kde/baloo-widgets.nix

@@ -14,4 +14,5 @@ mkDerivation {
   propagatedBuildInputs = [
     baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice
   ];
+  outputs = [ "out" "dev" ];
 }

pkgs/applications/kde/dolphin.nix

@@ -20,4 +20,5 @@ mkDerivation {
     kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
     phonon solid
   ];
+  outputs = [ "out" "dev" ];
 }

pkgs/applications/kde/gwenview.nix

@@ -13,9 +13,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ exiv2 lcms2 ];
+  buildInputs = [
-  propagatedBuildInputs = [
+    baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon
-    baloo kactivities kdelibs4support kio libkdcraw libkipi phonon
     qtimageformats qtsvg qtx11extras
   ];
   propagatedUserEnvPkgs = [ kipi-plugins ];

pkgs/applications/kde/kcontacts.nix

@@ -1,8 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  ki18n,
+  kcoreaddons, kconfig, kcodecs, ki18n, qtbase,
-  kcoreaddons, kconfig, kcodecs
 }:
 
 mkDerivation {
@@ -12,6 +11,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ki18n ];
+  buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];
-  propagatedBuildInputs = [ kcoreaddons kconfig kcodecs ];
 }

pkgs/applications/kde/kmime.nix

@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, ki18n,
-  kcodecs
+  kcodecs, qtbase,
 }:
 
 mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ki18n ];
-  buildInputs = [ kcodecs ];
+  buildInputs = [ kcodecs qtbase ];
 }

pkgs/applications/kde/kwalletmanager.nix

@@ -8,6 +8,7 @@
 , kcoreaddons
 , kdbusaddons
 , kdelibs4support
+, kwallet
 , kxmlgui
 }:
 
@@ -18,8 +19,8 @@ mkDerivation {
     maintainers = with lib.maintainers; [ fridh ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
-    kxmlgui
+    kwallet kxmlgui
   ];
 }

pkgs/applications/kde/okular.nix

@@ -4,18 +4,17 @@
   djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
   kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
   kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
-  libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
+  libspectre, phonon, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
 }:
 
 mkDerivation {
   name = "okular";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ djvulibre ebook_tools ];
+  buildInputs = [
-  propagatedBuildInputs = [
+    djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets
-    kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets
     kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio
-    kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler qca-qt5
+    kparts kpty kwallet kwindowsystem libkexiv2 libspectre phonon poppler
-    qtdeclarative qtsvg threadweaver
+    qca-qt5 qtdeclarative qtsvg threadweaver
   ];
   meta = {
     platforms = lib.platforms.linux;

pkgs/applications/kde/spectacle.nix

@@ -4,6 +4,7 @@
   ki18n, xcb-util-cursor,
   kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
   knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
+  qtx11extras
 }:
 
 mkDerivation {
@@ -13,7 +14,7 @@ mkDerivation {
   buildInputs = [ ki18n xcb-util-cursor ];
   propagatedBuildInputs = [
     kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications
-    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi
+    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras
   ];
   propagatedUserEnvPkgs = [ kipi-plugins ];
 }

pkgs/desktops/plasma-5/bluedevil.nix

@@ -7,11 +7,10 @@
 mkDerivation {
   name = "bluedevil";
   nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
-  propagatedBuildInputs = [
+  buildInputs = [
     bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
     kdbusaddons kded kiconthemes knotifications kwidgetsaddons
   ];
-  propagatedUserEnvPkgs = [ bluez-qt.out ];
   postInstall = ''
     # Fix the location of logic.js for the plasmoid
     ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js

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

@@ -2,7 +2,8 @@
   mkDerivation,
   extra-cmake-modules,
   frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration,
-  kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras
+  kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtdeclarative,
+  qtx11extras
 }:
 
 mkDerivation {
@@ -11,7 +12,8 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration
-    kguiaddons ki18n kwayland kwindowsystem plasma-framework qtx11extras
+    kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative
+    qtx11extras
   ];
   cmakeFlags = [ "-DUSE_Qt4=OFF" ];
 }

pkgs/desktops/plasma-5/kactivitymanagerd.nix

@@ -7,7 +7,7 @@
 mkDerivation {
   name = "kactivitymanagerd";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
     boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
     kxmlgui
   ];

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

@@ -1,14 +1,14 @@
 {
-  mkDerivation, extra-cmake-modules,
+  mkDerivation, extra-cmake-modules, kdoctools,
-  kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes,
+  kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem,
-  kwindowsystem, qtsvg, qtx11extras
+  qtsvg, qtx11extras,
 }:
 
 mkDerivation {
   name = "kde-cli-tools";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    kcmutils kconfig kdesu kdelibs4support ki18n kiconthemes kwindowsystem qtsvg
+    kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg
     qtx11extras
   ];
 }

pkgs/desktops/plasma-5/kde-gtk-config/default.nix

@@ -16,7 +16,7 @@ mkDerivation {
   name = "kde-gtk-config";
   patches = [ ./0001-follow-symlinks.patch ];
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
     ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     knewstuff
   ];

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

@@ -1,17 +1,17 @@
-{ mkDerivation, extra-cmake-modules, kdoctools
+{
-, kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
+  mkDerivation,
-, kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion
+  extra-cmake-modules, kdoctools,
-, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
+  kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio,
-, ibus
+  knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus,
+  plasma-framework, plasma-workspace, qtdeclarative, qtx11extras,
 }:
 
 mkDerivation {
   name = "kdeplasma-addons";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
-    kross krunner kservice ksysguard kunitconversion plasma-framework
+    kross krunner kservice ksysguard kunitconversion ibus plasma-framework
     plasma-workspace qtdeclarative qtx11extras
-    ibus
   ];
 }

pkgs/desktops/plasma-5/kgamma5.nix

@@ -1,9 +1,11 @@
-{ mkDerivation, extra-cmake-modules, kdoctools, kdelibs4support
+{
-, qtx11extras
+  mkDerivation,
+  extra-cmake-modules, kdoctools,
+  kconfig, kconfigwidgets, ki18n, qtx11extras,
 }:
 
 mkDerivation {
   name = "kgamma5";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kdelibs4support qtx11extras ];
+  buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras ];
 }

pkgs/desktops/plasma-5/khotkeys.nix

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

pkgs/desktops/plasma-5/kinfocenter.nix

@@ -9,7 +9,7 @@
 mkDerivation {
   name = "kinfocenter";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice
     kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid

pkgs/desktops/plasma-5/kscreen.nix

@@ -6,8 +6,8 @@
 mkDerivation {
   name = "kscreen";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig
+    kconfig kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui
-    kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
+    libkscreen qtdeclarative qtgraphicaleffects
   ];
 }

pkgs/desktops/plasma-5/kscreenlocker.nix

@@ -2,7 +2,8 @@
   mkDerivation,
   extra-cmake-modules, kdoctools,
   kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime,
-  kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland
+  kwayland, libXcursor, pam, plasma-framework, qtdeclarative, qtx11extras,
+  wayland,
 }:
 
 mkDerivation {
@@ -10,6 +11,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland
-    libXcursor pam plasma-framework qtdeclarative wayland
+    libXcursor pam plasma-framework qtdeclarative qtx11extras wayland
   ];
 }

pkgs/desktops/plasma-5/ksshaskpass.nix

@@ -1,9 +1,11 @@
-{ mkDerivation, extra-cmake-modules, kdoctools, kcoreaddons
+{
-, ki18n, kwallet, kwidgetsaddons
+  mkDerivation,
+  extra-cmake-modules, kdoctools,
+  kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase,
 }:
 
 mkDerivation {
   name = "ksshaskpass";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];
+  buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ];
 }

pkgs/desktops/plasma-5/kwallet-pam.nix

@@ -2,7 +2,6 @@
 
 mkDerivation {
   name = "kwallet-pam";
-
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ pam socat libgcrypt qtbase ];
   postPatch = ''

pkgs/desktops/plasma-5/kwayland-integration.nix

@@ -1,7 +1,11 @@
-{ mkDerivation , extra-cmake-modules , kidletime , kwayland , kwindowsystem }:
+{
+  mkDerivation,
+  extra-cmake-modules,
+  kidletime, kwayland, kwindowsystem, qtbase,
+}:
 
 mkDerivation {
   name = "kwayland-integration";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kidletime kwindowsystem kwayland ];
+  buildInputs = [ kidletime kwindowsystem kwayland qtbase ];
 }

pkgs/desktops/plasma-5/kwrited.nix

@@ -1,9 +1,11 @@
-{ mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, kpty
+{
-, knotifications, kdbusaddons
+  mkDerivation,
+  extra-cmake-modules,
+  kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase,
 }:
 
 mkDerivation {
   name = "kwrited";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ];
+  buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ];
 }

pkgs/desktops/plasma-5/milou.nix

@@ -1,6 +1,8 @@
-{ mkDerivation, extra-cmake-modules, qtscript, qtdeclarative
+{
-, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
+  mkDerivation,
-, krunner
+  extra-cmake-modules,
+  kcoreaddons, kdeclarative, ki18n, krunner, kservice, plasma-framework,
+  qtscript, qtdeclarative,
 }:
 
 mkDerivation {
@@ -8,8 +10,8 @@ mkDerivation {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript
+    kcoreaddons kdeclarative ki18n krunner kservice plasma-framework
-    kcoreaddons kservice
+    qtdeclarative qtscript
   ];
 }

pkgs/desktops/plasma-5/oxygen.nix

@@ -2,7 +2,8 @@
   mkDerivation,
   extra-cmake-modules,
   frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
-  ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
+  ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative,
+  qtx11extras
 }:
 
 mkDerivation {
@@ -10,6 +11,8 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
-    ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
+    ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative
+    qtx11extras
   ];
+  outputs = [ "out" "dev" "bin" ];
 }

pkgs/desktops/plasma-5/plasma-integration.nix

@@ -1,17 +1,17 @@
-{ mkDerivation, extra-cmake-modules
+{
-, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
+  mkDerivation,
-, libXcursor
+  extra-cmake-modules,
+  breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications,
+  kwayland, libXcursor
 }:
 
 # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
 
 mkDerivation {
   name = "plasma-integration";
-  nativeBuildInputs = [
+  nativeBuildInputs = [ extra-cmake-modules ];
-    extra-cmake-modules
-  ];
   buildInputs = [
-    breeze-qt5 kconfig kconfigwidgets kiconthemes kio kwayland
+    breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland
     libXcursor
   ];
 }

pkgs/desktops/plasma-5/plasma-nm/default.nix

@@ -1,10 +1,11 @@
-{ mkDerivation, substituteAll, extra-cmake-modules, kdoctools
+{
-, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
+  mkDerivation, substituteAll,
-, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
+  extra-cmake-modules, kdoctools,
-, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
+  kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative,
-, kxmlgui, mobile_broadband_provider_info
+  kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications,
-, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
+  kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
-, qca-qt5, qtdeclarative, solid, openvpn
+  mobile_broadband_provider_info, modemmanager-qt, networkmanager-qt,
+  openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid
 }:
 
 mkDerivation {
@@ -19,8 +20,8 @@ mkDerivation {
       inherit openvpn;
     })
   ];
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
     qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
     kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui

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

@@ -1,15 +1,15 @@
 {
   mkDerivation,
-  extra-cmake-modules,
+  extra-cmake-modules, kdoctools,
-  gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel,
+  gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n,
-  ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework
+  libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative
 }:
 
 mkDerivation {
   name = "plasma-pa";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    gconf glib kconfigwidgets kcoreaddons kdeclarative
+    gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n
-    kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework
+    libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative
   ];
 }

pkgs/development/libraries/kde-frameworks/attica.nix

@@ -8,4 +8,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/baloo.nix

@@ -1,14 +1,17 @@
-{ mkDerivation, lib, extra-cmake-modules, kauth, kconfig
+{
-, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
+  mkDerivation, lib,
-, kio, lmdb, qtbase, solid
+  extra-cmake-modules,
+  kauth, kconfig, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n,
+  kidletime, kio, lmdb, qtbase, qtdeclarative, solid,
 }:
 
 mkDerivation {
   name = "baloo";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio
+    kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative
-    kidletime lmdb qtbase solid
+    solid
   ];
+  propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ];
 }

pkgs/development/libraries/kde-frameworks/bluez-qt.nix

@@ -10,9 +10,10 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtdeclarative ];
+  buildInputs = [ qtdeclarative ];
+  propagatedBuildInputs = [ qtbase ];
   preConfigure = ''
     substituteInPlace CMakeLists.txt \
-      --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
+      --replace /lib/udev/rules.d "$bin/lib/udev/rules.d"
   '';
 }

pkgs/development/libraries/kde-frameworks/breeze-icons.nix

@@ -3,8 +3,7 @@
 mkDerivation {
   name = "breeze-icons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  outputs = [ "out" ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtsvg ];
-  propagatedUserEnvPkgs = [ qtsvg.out ];
+  outputs = [ "out" ]; # only runtime outputs
 }

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

@@ -39,11 +39,11 @@ let
     # SUPPORT
     let
 
-      propagateBin =
+      propagate = out:
         let setupHook = { writeScript }:
               writeScript "setup-hook.sh" ''
-                # Propagate $bin output
+                # Propagate $${out} output
-                propagatedUserEnvPkgs+=" @bin@"
+                propagatedUserEnvPkgs+=" @${out}@"
 
                 # Propagate $dev so that this setup hook is propagated
                 # But only if there is a separate $dev output
@@ -57,9 +57,11 @@ let
               '';
         in callPackage setupHook {};
 
+      propagateBin = propagate "bin";
+
       callPackage = self.newScope {
 
-        inherit propagateBin;
+        inherit propagate propagateBin;
 
         mkDerivation = args:
           let

pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh

@@ -1,17 +1,16 @@
-_ecmSetXdgDirs() {
+_ecmEnvHook() {
     addToSearchPath XDG_DATA_DIRS "$1/share"
     addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"
 }
+envHooks+=(_ecmEnvHook)
 
-envHooks+=(_ecmSetXdgDirs)
+_ecmPreConfigureHook() {
-
-_ecmConfig() {
     # Because we need to use absolute paths here, we must set *all* the paths.
     cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
     cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
     cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
     cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
-    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputBin}/lib/libexec"
+    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec"
     cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
     cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
     cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
@@ -25,7 +24,7 @@ _ecmConfig() {
     cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5"
     cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5"
     cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons"
-    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputBin}/share/locale"
+    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
     cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds"
     cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates"
     cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers"
@@ -52,5 +51,4 @@ _ecmConfig() {
         cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix"
     fi
 }
-
+preConfigureHooks+=(_ecmPreConfigureHook)
-preConfigureHooks+=(_ecmConfig)

pkgs/development/libraries/kde-frameworks/frameworkintegration.nix

@@ -9,8 +9,9 @@ mkDerivation {
   name = "frameworkintegration";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes
+    kbookmarks kcompletion kconfig ki18n kio knewstuff knotifications kpackage
-    knewstuff knotifications kpackage kwidgetsaddons libXcursor qtx11extras
+    kwidgetsaddons libXcursor qtx11extras
   ];
+  propagatedBuildInputs = [ kconfigwidgets kiconthemes ];
 }

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

@@ -1,8 +1,14 @@
-{ mkDerivation, lib, extra-cmake-modules, boost, kactivities, kconfig }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  boost, kactivities, kconfig, qtbase,
+}:
 
 mkDerivation {
   name = "kactivities-stats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ boost kactivities kconfig ];
+  buildInputs = [ boost kactivities kconfig ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

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

@@ -1,14 +1,15 @@
-{ mkDerivation, lib, extra-cmake-modules, boost, kcmutils, kconfig
+{
-, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
+  mkDerivation, lib,
-, kio, kservice, kwindowsystem, kxmlgui, qtdeclarative
+  extra-cmake-modules,
+  boost, kconfig, kcoreaddons, kio, kwindowsystem, qtbase, qtdeclarative,
 }:
 
 mkDerivation {
   name = "kactivities";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel
+    boost kconfig kcoreaddons kio kwindowsystem qtdeclarative
-    ki18n kio kservice kwindowsystem kxmlgui qtdeclarative
   ];
+  propagatedBuildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kapidox.nix

@@ -4,4 +4,7 @@ mkDerivation {
   name = "kapidox";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules python ];
+  postFixup = ''
+    moveToOutput bin $bin
+  '';
 }

pkgs/development/libraries/kde-frameworks/karchive.nix

@@ -1,4 +1,8 @@
-{ mkDerivation, lib, extra-cmake-modules, qtbase }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  bzip2, lzma, qtbase, zlib,
+}:
 
 mkDerivation {
   name = "karchive";
@@ -7,5 +11,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ bzip2 lzma zlib ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/kauth/default.nix

@@ -1,12 +1,17 @@
 {
-  mkDerivation, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore, propagate,
   extra-cmake-modules, kcoreaddons, polkit-qt, qttools
 }:
 
 mkDerivation {
   name = "kauth";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons polkit-qt ];
+  buildInputs = [ polkit-qt qttools ];
+  propagatedBuildInputs = [ kcoreaddons ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  # library stores reference to plugin path,
+  # separating $out from $bin would create a reference cycle
+  outputs = [ "out" "dev" ];
+  setupHook = propagate "out";
 }

pkgs/development/libraries/kde-frameworks/kbookmarks.nix

@@ -1,13 +1,17 @@
 {
-  mkDerivation, lib, extra-cmake-modules,
+  mkDerivation, lib,
-  kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kxmlgui
+  extra-cmake-modules, qttools,
+  kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kwidgetsaddons,
+  kxmlgui, qtbase,
 }:
 
 mkDerivation {
   name = "kbookmarks";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui
   ];
+  propagatedBuildInputs = [ kwidgetsaddons qtbase ];
+  outputs = [ "out" "dev" ];
 }

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

@@ -2,16 +2,17 @@
   mkDerivation, lib,
   extra-cmake-modules,
   kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews,
-  kpackage, kservice, kxmlgui
+  kpackage, kservice, kxmlgui, qtdeclarative,
 }:
 
 mkDerivation {
   name = "kcmutils";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews
+    kcoreaddons kdeclarative ki18n kiconthemes kitemviews kpackage kxmlgui
-    kpackage kservice kxmlgui
+    qtdeclarative
   ];
+  propagatedBuildInputs = [ kconfigwidgets kservice ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
 }

pkgs/development/libraries/kde-frameworks/kcodecs.nix

@@ -6,6 +6,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/kcompletion.nix

@@ -7,6 +7,8 @@
 mkDerivation {
   name = "kcompletion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kconfig kwidgetsaddons qtbase ];
+  buildInputs = [ kconfig kwidgetsaddons qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/kconfig.nix

@@ -6,6 +6,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools ];
   propagatedBuildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix

@@ -1,17 +1,20 @@
 {
   mkDerivation, lib, extra-cmake-modules,
-  kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons
+  kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons, qtbase,
 }:
 
 mkDerivation {
   name = "kconfigwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [ kguiaddons ki18n qtbase ];
-    kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons
+  propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ];
-  ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  outputs = [ "out" "dev" ];
+  preConfigure = ''
+    outputBin=dev
+  '';
   postInstall = ''
-    moveToOutput "bin/preparetips5" "$dev"
+    moveToOutput share/man $dev
   '';
 }

pkgs/development/libraries/kde-frameworks/kcoreaddons.nix

@@ -1,4 +1,8 @@
-{ mkDerivation, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }:
+{
+  mkDerivation, lib, fetchurl, writeScript,
+  extra-cmake-modules,
+  qtbase, qttools, shared_mime_info
+}:
 
 mkDerivation {
   name = "kcoreaddons";
@@ -6,6 +10,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtbase shared_mime_info ];
+  buildInputs = [ qttools shared_mime_info ];
+  propagatedBuildInputs = [ qtbase ];
 }

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

@@ -1,8 +1,14 @@
-{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcoreaddons, kwindowsystem, qtbase, qtx11extras,
+}:
 
 mkDerivation {
   name = "kcrash";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
+  buildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

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

@@ -1,4 +1,8 @@
-{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase, qttools, qtx11extras
+}:
 
 mkDerivation {
   name = "kdbusaddons";
@@ -6,6 +10,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtx11extras ];
+  buildInputs = [ qttools qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
 }

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

@@ -8,8 +8,9 @@ mkDerivation {
   name = "kdeclarative";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage
+    epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons
-    kwidgetsaddons kwindowsystem qtdeclarative
+    kwindowsystem
   ];
+  propagatedBuildInputs = [ kconfig kpackage qtdeclarative ];
 }

pkgs/development/libraries/kde-frameworks/kded.nix

@@ -1,13 +1,16 @@
 {
-  mkDerivation, lib, extra-cmake-modules,
+  mkDerivation, lib, propagate,
-  kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, kinit, kservice
+  extra-cmake-modules, kdoctools,
+  kconfig, kcoreaddons, kcrash, kdbusaddons, kinit, kservice, qtbase,
 }:
 
 mkDerivation {
   name = "kded";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    kconfig kcoreaddons kcrash kdbusaddons kinit kservice
+    kconfig kcoreaddons kcrash kdbusaddons kinit kservice qtbase
   ];
+  outputs = [ "out" "dev" ];
+  setupHook = propagate "out";
 }

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

@@ -1,12 +1,11 @@
 {
   mkDerivation, lib, copyPathsToStore,
-  extra-cmake-modules, kdoctools,
+  docbook_xml_dtd_45, extra-cmake-modules, kdoctools,
-  docbook_xml_dtd_45, kauth, karchive, kcompletion, kconfig, kconfigwidgets,
+  kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash,
-  kcoreaddons, kcrash, kdbusaddons, kded, kdesignerplugin, kemoticons,
+  kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons,
-  kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels, kinit,
+  ki18n, kiconthemes, kio, kitemmodels, kinit, knotifications, kparts, kservice,
-  knotifications, kparts, kservice, ktextwidgets, kunitconversion,
+  ktextwidgets, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui,
-  kwidgetsaddons, kwindowsystem, kxmlgui, networkmanager, qtsvg, qtx11extras,
+  networkmanager, qtbase, qtsvg, qttools, qtx11extras, xlibs
-  xlibs
 }:
 
 mkDerivation {
@@ -14,16 +13,20 @@ mkDerivation {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   setupHook = ./setup-hook.sh;
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  propagatedNativeBuildInputs = [ kdoctools ];
+  buildInputs = [
+    kcompletion kconfig kded kglobalaccel ki18n kio kservice kwidgetsaddons
+    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
+  ];
   propagatedBuildInputs = [
-    kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash
+    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons kdesignerplugin
-    kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n
+    kemoticons kguiaddons kiconthemes kitemmodels kinit knotifications kparts
-    kio kiconthemes kitemmodels kinit knotifications kparts kservice
+    ktextwidgets kunitconversion kwindowsystem qtbase
-    ktextwidgets kunitconversion kwidgetsaddons kwindowsystem kxmlgui
-    networkmanager qtsvg qtx11extras xlibs.libSM
   ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
     "-DDocBookXML4_DTD_VERSION=4.5"
   ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix

@@ -2,15 +2,15 @@
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   kcompletion, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kio,
-  kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, sonnet
+  kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, qttools, sonnet,
 }:
 
 mkDerivation {
   name = "kdesignerplugin";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio
+    kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews
-    kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet
+    kplotting ktextwidgets kwidgetsaddons kxmlgui qttools sonnet
   ];
 }

pkgs/development/libraries/kde-frameworks/kdesu.nix

@@ -1,10 +1,14 @@
-{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
+{
-, kservice
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcoreaddons, ki18n, kpty, kservice, qtbase,
 }:
 
 mkDerivation {
   name = "kdesu";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ];
+  buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ];
+  propagatedBuildInputs = [ kpty ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/kdnssd.nix

@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, qttools,
+  extra-cmake-modules,
-  avahi, qtbase
+  avahi, qtbase, qttools,
 }:
 
 mkDerivation {
@@ -10,6 +10,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ avahi qtbase ];
+  buildInputs = [ avahi qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/kdoctools/default.nix

@@ -1,18 +1,28 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl,
-  karchive, ki18n, perl, perlPackages
+  karchive, ki18n, qtbase,
+  perl, perlPackages
 }:
 
 mkDerivation {
   name = "kdoctools";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ karchive ki18n ];
   propagatedNativeBuildInputs = [ perl perlPackages.URI ];
+  buildInputs = [ karchive ki18n ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
+  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
+  preConfigure = ''
+    outputBin=dev
+  '';
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
     "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
   ];
-  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
+  postFixup = ''
+    moveToOutput "share/doc" "$dev"
+    moveToOutput "share/man" "$dev"
+  '';
 }

pkgs/development/libraries/kde-frameworks/kemoticons.nix

@@ -1,12 +1,13 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  karchive, kconfig, kcoreaddons, kservice
+  karchive, kcoreaddons, kservice, qtbase,
 }:
 
 mkDerivation {
   name = "kemoticons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ];
+  buildInputs = [ karchive kcoreaddons ];
+  propagatedBuildInputs = [ kservice qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix

@@ -7,9 +7,10 @@
 mkDerivation {
   name = "kfilemetadata";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib
+    attr ebook_tools exiv2 ffmpeg karchive ki18n poppler taglib
   ];
+  propagatedBuildInputs = [ qtbase ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }

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

@@ -2,14 +2,19 @@
   mkDerivation, lib,
   extra-cmake-modules,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
-  qtx11extras
+  qtbase, qttools, qtx11extras,
 }:
 
 mkDerivation {
   name = "kglobalaccel";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qtx11extras
+    kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools
+    qtx11extras
   ];
+  propagatedBuildInputs = [ qtbase ];
+  postPatch = ''
+    sed -i src/runtime/org.kde.kglobalaccel.service.in \
+        -e "s|@CMAKE_INSTALL_PREFIX@|''${!outputBin}|"
+  '';
 }

pkgs/development/libraries/kde-frameworks/kguiaddons.nix

@@ -11,5 +11,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtx11extras ];
+  buildInputs = [ qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

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

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

pkgs/development/libraries/kde-frameworks/ki18n.nix

@@ -12,5 +12,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedNativeBuildInputs = [ gettext python ];
-  propagatedBuildInputs = [ qtdeclarative qtscript ];
+  buildInputs = [ qtdeclarative qtscript ];
 }

pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix

@@ -1,7 +1,8 @@
 {
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules,
-  karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
+  breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews,
+  qtbase, qtsvg,
 }:
 
 mkDerivation {
@@ -9,5 +10,8 @@ mkDerivation {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ breeze-icons kconfigwidgets karchive ki18n kitemviews qtsvg ];
+  buildInputs = [
+    breeze-icons karchive kcoreaddons kconfigwidgets ki18n kitemviews
+  ];
+  propagatedBuildInputs = [ qtbase qtsvg ];
 }

pkgs/development/libraries/kde-frameworks/kidletime.nix

@@ -11,5 +11,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtbase qtx11extras ];
+  buildInputs = [ qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kimageformats.nix

@@ -1,14 +1,16 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  ilmbase, karchive, qtbase
+  ilmbase, karchive, openexr, qtbase
 }:
 
+let inherit (lib) getDev; in
+
 mkDerivation {
   name = "kimageformats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ilmbase qtbase ];
+  buildInputs = [ karchive openexr qtbase ];
-  propagatedBuildInputs = [ karchive ];
+  outputs = [ "out" ]; # plugins only
-  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
+  NIX_CFLAGS_COMPILE = "-I${getDev ilmbase}/include/OpenEXR";
 }

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

@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore, writeScript,
   extra-cmake-modules, kdoctools,
   kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework
 }:
@@ -10,7 +10,7 @@ mkDerivation {
   name = "kinit";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig kcrash ki18n kio kservice kwindowsystem
   ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
@@ -19,4 +19,18 @@ mkDerivation {
     ''-DNIXPKGS_KF5_PARTS="${getLib kparts}/lib/libKF5Parts.so.5"''
     ''-DNIXPKGS_KF5_PLASMA="${getLib plasma-framework}/lib/libKF5Plasma.so.5"''
   ];
+  postFixup = ''
+    moveToOutput "lib/libexec/kf5/start_kdeinit" "$bin"
+  '';
+  setupHook = writeScript "setup-hook.sh" ''
+    kinitFixupOutputHook() {
+        if [ $prefix != ''${!outputBin} ] && [ -d $prefix/lib ]; then
+            mkdir -p ''${!outputBin}/lib
+            find $prefix/lib -maxdepth 1 -name 'libkdeinit5_*.so' -exec ln -s \{\} ''${!outputBin}/lib \;
+            rmdir --ignore-fail-on-non-empty ''${!outputBin}/lib
+        fi
+    }
+
+    fixupOutputHooks+=(kinitFixupOutputHook)
+  '';
 }

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

@@ -1,21 +1,23 @@
 {
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
-  acl, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
+  karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
   kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
   kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
-  qtscript, qtx11extras, solid, fetchpatch
+  qtbase, qtscript, qtx11extras, solid,
 }:
 
 mkDerivation {
   name = "kio";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications
+    ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras
+  ];
   propagatedBuildInputs = [
-    acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
+    kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice
-    kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice
+    kxmlgui qtbase solid
-    ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript
-    qtx11extras
   ];
   patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
 }

pkgs/development/libraries/kde-frameworks/kitemmodels.nix

@@ -12,4 +12,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/kitemviews.nix

@@ -10,6 +10,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools ];
   propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

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

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

pkgs/development/libraries/kde-frameworks/kjs.nix

@@ -1,10 +1,12 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools
+  extra-cmake-modules, kdoctools,
+  qtbase,
 }:
 
 mkDerivation {
   name = "kjs";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kjsembed.nix

@@ -1,11 +1,13 @@
 {
-  mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kjs
+  mkDerivation, lib,
-, qtsvg
+  extra-cmake-modules, kdoctools, qttools,
+  ki18n, kjs, qtsvg,
 }:
 
 mkDerivation {
   name = "kjsembed";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
-  propagatedBuildInputs = [ ki18n kjs qtsvg ];
+  buildInputs = [ ki18n qtsvg ];
+  propagatedBuildInputs = [ kjs ];
 }

pkgs/development/libraries/kde-frameworks/kmediaplayer.nix

@@ -8,5 +8,5 @@ mkDerivation {
   name = "kmediaplayer";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kparts kxmlgui ];
+  buildInputs = [ kparts kxmlgui ];
 }

pkgs/development/libraries/kde-frameworks/knewstuff.nix

@@ -1,14 +1,18 @@
-{ mkDerivation, lib, extra-cmake-modules, attica, karchive
+{
-, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
+  mkDerivation, lib,
-, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
+  extra-cmake-modules,
+  attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes,
+  kio, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase,
+  qtdeclarative,
 }:
 
 mkDerivation {
   name = "knewstuff";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio
+    karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews
-    kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui
+    ktextwidgets kwidgetsaddons qtbase qtdeclarative
   ];
+  propagatedBuildInputs = [ attica kservice kxmlgui ];
 }

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

@@ -10,7 +10,7 @@ mkDerivation {
   name = "knotifications";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras
   ];
 }

pkgs/development/libraries/kde-frameworks/knotifyconfig.nix

@@ -1,10 +1,14 @@
-{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig
+{
-, ki18n, kio, phonon
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcompletion, kconfig, ki18n, kio, phonon, qtbase,
 }:
 
 mkDerivation {
   name = "knotifyconfig";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcompletion kconfig ki18n kio phonon ];
+  buildInputs = [ kcompletion kconfig ki18n kio phonon ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/kpackage/default.nix

@@ -1,13 +1,13 @@
 {
   mkDerivation, fetchurl, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
-  karchive, kconfig, kcoreaddons, ki18n
+  karchive, kconfig, kcoreaddons, ki18n, qtbase,
 }:
 
 mkDerivation {
   name = "kpackage";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ];
+  buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }

pkgs/development/libraries/kde-frameworks/kparts.nix

@@ -1,14 +1,17 @@
-{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons
+{
-, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
+  mkDerivation, lib,
-, ktextwidgets, kwidgetsaddons, kxmlgui
+  extra-cmake-modules,
+  kconfig, kcoreaddons, ki18n, kiconthemes, kio, kjobwidgets, knotifications,
+  kservice, ktextwidgets, kwidgetsaddons, kxmlgui
 }:
 
 mkDerivation {
   name = "kparts";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    kconfig kcoreaddons ki18n kiconthemes kio kjobwidgets knotifications
+    kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications kservice
-    kservice ktextwidgets kwidgetsaddons kxmlgui
+    kwidgetsaddons
   ];
+  propagatedBuildInputs = [ kio ktextwidgets kxmlgui ];
 }

pkgs/development/libraries/kde-frameworks/kpeople.nix

@@ -1,12 +1,16 @@
-{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n
+{
-, kitemviews, kservice, kwidgetsaddons, qtdeclarative
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcoreaddons, ki18n, kitemviews, kservice, kwidgetsaddons, qtbase,
+  qtdeclarative,
 }:
 
 mkDerivation {
   name = "kpeople";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative
   ];
+  propagatedBuildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kplotting.nix

@@ -9,5 +9,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/kpty.nix

@@ -1,8 +1,9 @@
-{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n }:
+{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, qtbase, }:
 
 mkDerivation {
   name = "kpty";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
+  buildInputs = [ kcoreaddons ki18n qtbase ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/kross.nix

@@ -1,14 +1,14 @@
 { mkDerivation, lib, extra-cmake-modules, kcompletion, kcoreaddons
 , kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
-, kxmlgui, qtscript
+, kxmlgui, qtbase, qtscript, qtxmlpatterns,
 }:
 
 mkDerivation {
   name = "kross";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
   propagatedBuildInputs = [
-    kcompletion kcoreaddons ki18n kiconthemes kio kparts kwidgetsaddons kxmlgui
+    ki18n kiconthemes kio kparts kwidgetsaddons qtbase qtscript qtxmlpatterns
-    qtscript
   ];
 }

pkgs/development/libraries/kde-frameworks/krunner.nix

@@ -1,14 +1,17 @@
-{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons
+{
-, ki18n, kio, kservice, plasma-framework, solid
+  mkDerivation, lib,
-, threadweaver
+  extra-cmake-modules,
+  kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase,
+  qtdeclarative, solid, threadweaver
 }:
 
 mkDerivation {
   name = "krunner";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    kconfig kcoreaddons ki18n kio kservice plasma-framework solid
+    kconfig kcoreaddons ki18n kio kservice qtdeclarative solid
     threadweaver
   ];
+  propagatedBuildInputs = [ plasma-framework qtbase ];
 }

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

@@ -1,14 +1,18 @@
 {
   mkDerivation, lib, copyPathsToStore,
   bison, extra-cmake-modules, flex,
-  kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
+  kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem,
+  qtbase,
 }:
 
 mkDerivation {
   name = "kservice";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  propagatedNativeBuildInputs = [ bison extra-cmake-modules flex ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  nativeBuildInputs = [ kdoctools ];
+  propagatedNativeBuildInputs = [ bison flex ];
-  propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
+  buildInputs = [
+    kcrash kdbusaddons ki18n kwindowsystem qtbase
+  ];
+  propagatedBuildInputs = [ kconfig kcoreaddons ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }

pkgs/development/libraries/kde-frameworks/ktexteditor.nix

@@ -1,17 +1,17 @@
-{ mkDerivation, lib, copyPathsToStore
+{
-, extra-cmake-modules, perl
+  mkDerivation, lib, copyPathsToStore,
-, karchive, kconfig, kguiaddons, kiconthemes, kparts
+  extra-cmake-modules, perl,
-, libgit2
+  karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2,
-, qtscript, qtxmlpatterns
+  qtscript, qtxmlpatterns, sonnet, syntax-highlighting
-, ki18n, kio, sonnet, syntax-highlighting
 }:
 
 mkDerivation {
   name = "ktexteditor";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules perl ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript
+    karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript
     qtxmlpatterns sonnet syntax-highlighting
   ];
+  propagatedBuildInputs = [ kparts ];
 }

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

@@ -1,14 +1,16 @@
-{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig
+{
-, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
+  mkDerivation, lib,
-, sonnet
+  extra-cmake-modules,
+  kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kservice,
+  kwindowsystem, qtbase, sonnet,
 }:
 
 mkDerivation {
   name = "ktextwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
-    kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwindowsystem
+    kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem
-    sonnet
   ];
+  propagatedBuildInputs = [ ki18n qtbase sonnet ];
 }

pkgs/development/libraries/kde-frameworks/kunitconversion.nix

@@ -1,8 +1,9 @@
-{ mkDerivation, lib, extra-cmake-modules, ki18n }:
+{ mkDerivation, lib, extra-cmake-modules, ki18n, qtbase, }:
 
 mkDerivation {
   name = "kunitconversion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n ];
+  buildInputs = [ ki18n qtbase ];
+  outputs = [ "out" "dev" ];
 }

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

@@ -1,14 +1,18 @@
-{ mkDerivation, lib, extra-cmake-modules, kconfig, kconfigwidgets
+{
-, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
+  mkDerivation, lib,
-, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt, gpgme
+  extra-cmake-modules, kdoctools,
+  kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, ki18n,
+  kiconthemes, knotifications, kservice, kwidgetsaddons, kwindowsystem,
+  libgcrypt, qgpgme, qtbase,
 }:
 
 mkDerivation {
   name = "kwallet";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes
-    knotifications kservice kwidgetsaddons kwindowsystem libgcrypt gpgme
+    knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme
   ];
+  propagatedBuildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kwayland.nix

@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, propagateBin,
   extra-cmake-modules,
   qtbase, wayland
 }:
@@ -11,6 +11,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ wayland ];
-  propagatedBuildInputs = [ wayland ];
+  propagatedBuildInputs = [ qtbase ];
+  setupHook = propagateBin; # XDG_CONFIG_DIRS
 }

pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix

@@ -1,5 +1,7 @@
-{ mkDerivation, lib
+{
-, extra-cmake-modules, qtbase, qttools
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase, qttools
 }:
 
 mkDerivation {
@@ -8,6 +10,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix

@@ -10,10 +10,11 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtx11extras ];
+  buildInputs = [ qttools qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"$out/$qtPluginPrefix\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\""
   '';
 }

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

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

pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix

@@ -4,5 +4,7 @@ mkDerivation {
   name = "kxmlrpcclient";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n kio ];
+  buildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kio ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix

@@ -1,6 +1,7 @@
-{ mkDerivation, lib
+{
-, extra-cmake-modules
+  mkDerivation, lib,
-, modemmanager, qtbase
+  extra-cmake-modules,
+  modemmanager, qtbase
 }:
 
 mkDerivation {
@@ -10,6 +11,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ modemmanager qtbase ];
-  propagatedBuildInputs = [ modemmanager ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix

@@ -1,6 +1,7 @@
-{ mkDerivation, lib
+{
-, extra-cmake-modules
+  mkDerivation, lib,
-, qtbase, networkmanager
+  extra-cmake-modules,
+  networkmanager, qtbase,
 }:
 
 mkDerivation {
@@ -10,6 +11,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ networkmanager qtbase ];
-  propagatedBuildInputs = [ networkmanager ];
+  outputs = [ "out" "dev" ];
 }

pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix

@@ -9,7 +9,7 @@ mkDerivation {
     license = lib.licenses.lgpl3Plus;
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  outputs = [ "out" ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
+  outputs = [ "out" ]; # only runtime outputs
 }