103 files changed, 15 insertions, 11 deletions

diff --git a/pkgs/desktops/kde-5/frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix
index 98721876c12..98721876c12 100644
--- a/pkgs/desktops/kde-5/frameworks/attica.nix
+++ b/pkgs/development/libraries/kde-frameworks/attica.nix
diff --git a/pkgs/desktops/kde-5/frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix
index 825a125c8a7..825a125c8a7 100644
--- a/pkgs/desktops/kde-5/frameworks/baloo.nix
+++ b/pkgs/development/libraries/kde-frameworks/baloo.nix
diff --git a/pkgs/desktops/kde-5/frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
index 26490167dbd..26490167dbd 100644
--- a/pkgs/desktops/kde-5/frameworks/bluez-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
diff --git a/pkgs/desktops/kde-5/frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
index 773261638c9..773261638c9 100644
--- a/pkgs/desktops/kde-5/frameworks/breeze-icons.nix
+++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
diff --git a/pkgs/desktops/kde-5/frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index bff2b394038..bff2b394038 100644
--- a/pkgs/desktops/kde-5/frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
index 1c2ea70442d..1c2ea70442d 100644
--- a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
index a74340a6dc9..a74340a6dc9 100644
--- a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/nix-lib-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
diff --git a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/series b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series
index b4569e50a5f..b4569e50a5f 100644
--- a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/series
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series
diff --git a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
index 5363f4e30fd..5363f4e30fd 100644
--- a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
diff --git a/pkgs/desktops/kde-5/frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
index ee1b188d407..ee1b188d407 100644
--- a/pkgs/desktops/kde-5/frameworks/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
index 0080c5c3164..0080c5c3164 100644
--- a/pkgs/desktops/kde-5/frameworks/kactivities-stats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix
index 167c3f15bbd..167c3f15bbd 100644
--- a/pkgs/desktops/kde-5/frameworks/kactivities.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix
index f78a5ea08a4..f78a5ea08a4 100644
--- a/pkgs/desktops/kde-5/frameworks/kapidox.nix
+++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix
diff --git a/pkgs/desktops/kde-5/frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix
index bec44a6d687..bec44a6d687 100644
--- a/pkgs/desktops/kde-5/frameworks/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks/karchive.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kauth/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks/kauth/cmake-install-paths.patch
index c66f5ecd008..c66f5ecd008 100644
--- a/pkgs/desktops/kde-5/frameworks/kauth/cmake-install-paths.patch
+++ b/pkgs/development/libraries/kde-frameworks/kauth/cmake-install-paths.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
index 4bdba88bc3b..4bdba88bc3b 100644
--- a/pkgs/desktops/kde-5/frameworks/kauth/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kauth/series b/pkgs/development/libraries/kde-frameworks/kauth/series
index d2689425c38..d2689425c38 100644
--- a/pkgs/desktops/kde-5/frameworks/kauth/series
+++ b/pkgs/development/libraries/kde-frameworks/kauth/series
diff --git a/pkgs/desktops/kde-5/frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
index 7348e591d9c..7348e591d9c 100644
--- a/pkgs/desktops/kde-5/frameworks/kbookmarks.nix
+++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch
index 0d861fa9501..0d861fa9501 100644
--- a/pkgs/desktops/kde-5/frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
index fdf55174548..fdf55174548 100644
--- a/pkgs/desktops/kde-5/frameworks/kcmutils/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
index 53a69a69b69..53a69a69b69 100644
--- a/pkgs/desktops/kde-5/frameworks/kcodecs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
index 8c45bed2585..8c45bed2585 100644
--- a/pkgs/desktops/kde-5/frameworks/kcompletion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix
index 154329d0e98..154329d0e98 100644
--- a/pkgs/desktops/kde-5/frameworks/kconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
index 7a6c0ee9053..7a6c0ee9053 100644
--- a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
index f507abe2991..f507abe2991 100644
--- a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index 94b4136df3d..94b4136df3d 100644
--- a/pkgs/desktops/kde-5/frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix
index 133a81c60c1..133a81c60c1 100644
--- a/pkgs/desktops/kde-5/frameworks/kcrash.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
index eadd645fb99..eadd645fb99 100644
--- a/pkgs/desktops/kde-5/frameworks/kdbusaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
index 8db1b73c91a..8db1b73c91a 100644
--- a/pkgs/desktops/kde-5/frameworks/kdeclarative.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix
index fd286accb9f..fd286accb9f 100644
--- a/pkgs/desktops/kde-5/frameworks/kded.nix
+++ b/pkgs/development/libraries/kde-frameworks/kded.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
index 1765ffa9a39..1765ffa9a39 100644
--- a/pkgs/desktops/kde-5/frameworks/kdelibs4support/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch
index eabb7025448..eabb7025448 100644
--- a/pkgs/desktops/kde-5/frameworks/kdelibs4support/nix-kde-include-dir.patch
+++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks/kdelibs4support/series
index 9b08ab20877..9b08ab20877 100644
--- a/pkgs/desktops/kde-5/frameworks/kdelibs4support/series
+++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/series
diff --git a/pkgs/desktops/kde-5/frameworks/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh
index 21ac2e83b5d..21ac2e83b5d 100644
--- a/pkgs/desktops/kde-5/frameworks/kdelibs4support/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh
diff --git a/pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
index 8e17a1a60c8..8e17a1a60c8 100644
--- a/pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kdesu.nix b/pkgs/development/libraries/kde-frameworks/kdesu.nix
index fcccea9161f..fcccea9161f 100644
--- a/pkgs/desktops/kde-5/frameworks/kdesu.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesu.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
index 8fda4e63e3a..8fda4e63e3a 100644
--- a/pkgs/desktops/kde-5/frameworks/kdnssd.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
index 99fc4c7d023..99fc4c7d023 100644
--- a/pkgs/desktops/kde-5/frameworks/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch
index 4e3a33efab3..4e3a33efab3 100644
--- a/pkgs/desktops/kde-5/frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh
index 5cfffbd622d..5cfffbd622d 100644
--- a/pkgs/desktops/kde-5/frameworks/kdoctools/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh
diff --git a/pkgs/desktops/kde-5/frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
index 1e31277172d..1e31277172d 100644
--- a/pkgs/desktops/kde-5/frameworks/kemoticons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch
index 732f7b69c82..732f7b69c82 100644
--- a/pkgs/desktops/kde-5/frameworks/kfilemetadata/cmake-install-paths.patch
+++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
index bc7349e7453..bc7349e7453 100644
--- a/pkgs/desktops/kde-5/frameworks/kfilemetadata/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks/kfilemetadata/series
index d2689425c38..d2689425c38 100644
--- a/pkgs/desktops/kde-5/frameworks/kfilemetadata/series
+++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/series
diff --git a/pkgs/desktops/kde-5/frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index 4743d0b8f1b..4743d0b8f1b 100644
--- a/pkgs/desktops/kde-5/frameworks/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
index 6ebfd1104f7..6ebfd1104f7 100644
--- a/pkgs/desktops/kde-5/frameworks/kguiaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
diff --git a/pkgs/desktops/kde-5/frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix
index 99f6fe31e0d..99f6fe31e0d 100644
--- a/pkgs/desktops/kde-5/frameworks/khtml.nix
+++ b/pkgs/development/libraries/kde-frameworks/khtml.nix
diff --git a/pkgs/desktops/kde-5/frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix
index 2698a97fd33..2698a97fd33 100644
--- a/pkgs/desktops/kde-5/frameworks/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks/kiconthemes/default-theme-breeze.patch
index f7cb0ea3aac..f7cb0ea3aac 100644
--- a/pkgs/desktops/kde-5/frameworks/kiconthemes/default-theme-breeze.patch
+++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default-theme-breeze.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
index 6102bb0d4b5..6102bb0d4b5 100644
--- a/pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kiconthemes/series b/pkgs/development/libraries/kde-frameworks/kiconthemes/series
index ab5cc8a3edb..ab5cc8a3edb 100644
--- a/pkgs/desktops/kde-5/frameworks/kiconthemes/series
+++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/series
diff --git a/pkgs/desktops/kde-5/frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix
index 758260517e7..758260517e7 100644
--- a/pkgs/desktops/kde-5/frameworks/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
index fbc8d092f86..fbc8d092f86 100644
--- a/pkgs/desktops/kde-5/frameworks/kimageformats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
index b965f761e92..b965f761e92 100644
--- a/pkgs/desktops/kde-5/frameworks/kinit/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
index a5c76fca248..a5c76fca248 100644
--- a/pkgs/desktops/kde-5/frameworks/kinit/kinit-libpath.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kinit/series b/pkgs/development/libraries/kde-frameworks/kinit/series
index 576b8a935bf..576b8a935bf 100644
--- a/pkgs/desktops/kde-5/frameworks/kinit/series
+++ b/pkgs/development/libraries/kde-frameworks/kinit/series
diff --git a/pkgs/desktops/kde-5/frameworks/kinit/start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
index fbecf9433f6..fbecf9433f6 100644
--- a/pkgs/desktops/kde-5/frameworks/kinit/start_kdeinit-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index cb67c845903..cb67c845903 100644
--- a/pkgs/desktops/kde-5/frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch
index c9ad46b41bb..c9ad46b41bb 100644
--- a/pkgs/desktops/kde-5/frameworks/kio/samba-search-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kio/series b/pkgs/development/libraries/kde-frameworks/kio/series
index 77ca1545004..77ca1545004 100644
--- a/pkgs/desktops/kde-5/frameworks/kio/series
+++ b/pkgs/development/libraries/kde-frameworks/kio/series
diff --git a/pkgs/desktops/kde-5/frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
index 7dff10b7fe0..7dff10b7fe0 100644
--- a/pkgs/desktops/kde-5/frameworks/kitemmodels.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
index 77f4b662160..77f4b662160 100644
--- a/pkgs/desktops/kde-5/frameworks/kitemviews.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
index 2692458b8be..2692458b8be 100644
--- a/pkgs/desktops/kde-5/frameworks/kjobwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix
index abdc15ce8df..abdc15ce8df 100644
--- a/pkgs/desktops/kde-5/frameworks/kjs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjs.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
index 95bc02422f1..95bc02422f1 100644
--- a/pkgs/desktops/kde-5/frameworks/kjsembed.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
index 93a6b450f76..93a6b450f76 100644
--- a/pkgs/desktops/kde-5/frameworks/kmediaplayer.nix
+++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
diff --git a/pkgs/desktops/kde-5/frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff.nix
index 002418c65ad..002418c65ad 100644
--- a/pkgs/desktops/kde-5/frameworks/knewstuff.nix
+++ b/pkgs/development/libraries/kde-frameworks/knewstuff.nix
diff --git a/pkgs/desktops/kde-5/frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix
index 7196832495f..7196832495f 100644
--- a/pkgs/desktops/kde-5/frameworks/knotifications.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix
diff --git a/pkgs/desktops/kde-5/frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
index 0e357aecb99..0e357aecb99 100644
--- a/pkgs/desktops/kde-5/frameworks/knotifyconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
index e9d74444814..e9d74444814 100644
--- a/pkgs/desktops/kde-5/frameworks/kpackage/allow-external-paths.patch
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
index a39a672574b..a39a672574b 100644
--- a/pkgs/desktops/kde-5/frameworks/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch
index ddbf17d0006..ddbf17d0006 100644
--- a/pkgs/desktops/kde-5/frameworks/kpackage/qdiriterator-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kpackage/series b/pkgs/development/libraries/kde-frameworks/kpackage/series
index 9b7f076efc7..9b7f076efc7 100644
--- a/pkgs/desktops/kde-5/frameworks/kpackage/series
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/series
diff --git a/pkgs/desktops/kde-5/frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix
index ad6ea2dbc30..ad6ea2dbc30 100644
--- a/pkgs/desktops/kde-5/frameworks/kparts.nix
+++ b/pkgs/development/libraries/kde-frameworks/kparts.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix
index 6acb5e2eed5..6acb5e2eed5 100644
--- a/pkgs/desktops/kde-5/frameworks/kpeople.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix
index 601f1778db7..601f1778db7 100644
--- a/pkgs/desktops/kde-5/frameworks/kplotting.nix
+++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix
index 8bdaacb85f8..8bdaacb85f8 100644
--- a/pkgs/desktops/kde-5/frameworks/kpty.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpty.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix
index 0e66d95b5cc..0e66d95b5cc 100644
--- a/pkgs/desktops/kde-5/frameworks/kross.nix
+++ b/pkgs/development/libraries/kde-frameworks/kross.nix
diff --git a/pkgs/desktops/kde-5/frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix
index ec9ab7abe9f..ec9ab7abe9f 100644
--- a/pkgs/desktops/kde-5/frameworks/krunner.nix
+++ b/pkgs/development/libraries/kde-frameworks/krunner.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
index 484be408794..484be408794 100644
--- a/pkgs/desktops/kde-5/frameworks/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kservice/no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks/kservice/no-canonicalize-path.patch
index cf98ffb9067..cf98ffb9067 100644
--- a/pkgs/desktops/kde-5/frameworks/kservice/no-canonicalize-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/kservice/no-canonicalize-path.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kservice/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch
index cbe13b70950..cbe13b70950 100644
--- a/pkgs/desktops/kde-5/frameworks/kservice/qdiriterator-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/frameworks/kservice/series b/pkgs/development/libraries/kde-frameworks/kservice/series
index 3ce22dbd35a..3ce22dbd35a 100644
--- a/pkgs/desktops/kde-5/frameworks/kservice/series
+++ b/pkgs/development/libraries/kde-frameworks/kservice/series
diff --git a/pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor/default.nix
index a35af2e7fbf..a35af2e7fbf 100644
--- a/pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks/ktexteditor/no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks/ktexteditor/no-qcoreapplication.patch
index 19ab1e1e551..19ab1e1e551 100644
--- a/pkgs/desktops/kde-5/frameworks/ktexteditor/no-qcoreapplication.patch
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor/no-qcoreapplication.patch
diff --git a/pkgs/desktops/kde-5/frameworks/ktexteditor/series b/pkgs/development/libraries/kde-frameworks/ktexteditor/series
index 46cd23829a2..46cd23829a2 100644
--- a/pkgs/desktops/kde-5/frameworks/ktexteditor/series
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor/series
diff --git a/pkgs/desktops/kde-5/frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
index 25954c60397..25954c60397 100644
--- a/pkgs/desktops/kde-5/frameworks/ktextwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
index c04ded722aa..c04ded722aa 100644
--- a/pkgs/desktops/kde-5/frameworks/kunitconversion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix
index f02c6138df7..f02c6138df7 100644
--- a/pkgs/desktops/kde-5/frameworks/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index db332841308..db332841308 100644
--- a/pkgs/desktops/kde-5/frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
index 7f2b35d8f7b..7f2b35d8f7b 100644
--- a/pkgs/desktops/kde-5/frameworks/kwidgetsaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix
index 6acab52d135..6acab52d135 100644
--- a/pkgs/desktops/kde-5/frameworks/kwindowsystem.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
index ea800bf58ae..ea800bf58ae 100644
--- a/pkgs/desktops/kde-5/frameworks/kxmlgui.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
diff --git a/pkgs/desktops/kde-5/frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
index f20f4a22394..f20f4a22394 100644
--- a/pkgs/desktops/kde-5/frameworks/kxmlrpcclient.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
diff --git a/pkgs/desktops/kde-5/frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
index e03254a71ed..e03254a71ed 100644
--- a/pkgs/desktops/kde-5/frameworks/modemmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
diff --git a/pkgs/desktops/kde-5/frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
index 0515509a77c..0515509a77c 100644
--- a/pkgs/desktops/kde-5/frameworks/networkmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
diff --git a/pkgs/desktops/kde-5/frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
index 0b5c75b960d..0b5c75b960d 100644
--- a/pkgs/desktops/kde-5/frameworks/oxygen-icons5.nix
+++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
diff --git a/pkgs/desktops/kde-5/frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index a4138148653..a4138148653 100644
--- a/pkgs/desktops/kde-5/frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
diff --git a/pkgs/desktops/kde-5/frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix
index c4f580fe1c2..c4f580fe1c2 100644
--- a/pkgs/desktops/kde-5/frameworks/solid.nix
+++ b/pkgs/development/libraries/kde-frameworks/solid.nix
diff --git a/pkgs/desktops/kde-5/frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix
index 28c24302abc..28c24302abc 100644
--- a/pkgs/desktops/kde-5/frameworks/sonnet.nix
+++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix
diff --git a/pkgs/desktops/kde-5/frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 5c48ece1e99..5c48ece1e99 100644
--- a/pkgs/desktops/kde-5/frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
diff --git a/pkgs/desktops/kde-5/frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
index b8f2939e8b5..b8f2939e8b5 100644
--- a/pkgs/desktops/kde-5/frameworks/threadweaver.nix
+++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48aea318595..0b87df2c619 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9066,7 +9066,12 @@ in
 
   qt5ct = qt5.callPackage ../tools/misc/qt5ct { };
 
-  qt5LibsFun = self: with self; {
+  qt5LibsFun = self: with self;
+    let kdeFrameworks =
+          import ../development/libraries/kde-frameworks { inherit pkgs; } self;
+    in {
+
+    inherit kdeFrameworks;
 
     accounts-qt = callPackage ../development/libraries/accounts-qt { };
 
@@ -9086,6 +9091,12 @@ in
 
     openbr = callPackage ../development/libraries/openbr { };
 
+    phonon = callPackage ../development/libraries/phonon { };
+
+    phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { };
+
+    phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { };
+
     polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { };
 
     poppler = callPackage ../development/libraries/poppler {
@@ -9110,7 +9121,7 @@ in
       ffmpeg = ffmpeg_2;
     });
 
-  };
+  } // kdeFrameworks;
 
   qtEnv = qt5.env;
   qt5Full = qt5.full;
@@ -16238,12 +16249,6 @@ in
       openjpeg = openjpeg_1;
     };
 
-    phonon = callPackage ../development/libraries/phonon { };
-
-    phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { };
-
-    phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { };
-
     quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix {
       monolithic = true;
       daemon = false;
@@ -16286,14 +16291,13 @@ in
 
   kde5 =
     let
-      frameworks = import ../desktops/kde-5/frameworks { inherit pkgs; };
       plasma = import ../desktops/kde-5/plasma { inherit pkgs; };
       applications = import ../desktops/kde-5/applications { inherit pkgs; };
       merged = self:
         { plasma = plasma self;
-          frameworks = frameworks self;
+          frameworks = qt5.kdeFrameworks;
           applications = applications self; }
-        // frameworks self
+        // qt5.kdeFrameworks
         // plasma self
         // applications self
         // kde5PackagesFun self;