diff --git a/pkgs/desktops/kde-5/applications/kcalc.nix b/pkgs/desktops/kde-5/applications/kcalc.nix
index dae2b994577c..7bdc799aeb9f 100644
--- a/pkgs/desktops/kde-5/applications/kcalc.nix
+++ b/pkgs/desktops/kde-5/applications/kcalc.nix
@@ -1,14 +1,7 @@
-{ kdeApp
-, lib
-, makeQtWrapper
-, extra-cmake-modules
-, gmp
-, kdoctools
-, kconfig
-, kconfigwidgets
-, kguiaddons
-, kinit
-, knotifications
+{
+  kdeApp, lib, makeQtWrapper, kdoctools,
+  extra-cmake-modules, kconfig, kconfigwidgets, kguiaddons, kinit,
+  knotifications, gmp
 }:
 
 kdeApp {
@@ -17,11 +10,7 @@ kdeApp {
     license = with lib.licenses; [ gpl2 ];
     maintainers = [ lib.maintainers.fridh ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   propagatedBuildInputs = [
     gmp kconfig kconfigwidgets kguiaddons kinit knotifications
   ];
diff --git a/pkgs/desktops/kde-5/frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/attica.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/baloo.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/bluez-qt.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/breeze-icons.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/extra-cmake-modules/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/extra-cmake-modules/nix-lib-path.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/extra-cmake-modules/series
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/frameworkintegration.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kactivities-stats.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kactivities.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kapidox.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/karchive.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kauth/cmake-install-paths.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kauth/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kauth/series
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kbookmarks.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kcmutils/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kcodecs.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kcompletion.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kconfig.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kcoreaddons.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kcrash.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kdbusaddons.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kdeclarative.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kded.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kdelibs4support/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kdelibs4support/nix-kde-include-dir.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kdelibs4support/series
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kdelibs4support/setup-hook.sh
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kdesu.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kdnssd.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kdoctools/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kdoctools/setup-hook.sh
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kemoticons.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kfilemetadata/cmake-install-paths.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kfilemetadata/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kfilemetadata/series
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kglobalaccel.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kguiaddons.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/khtml.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/ki18n.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kiconthemes/default-theme-breeze.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kiconthemes/series
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kidletime.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kimageformats.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kinit/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kinit/kinit-libpath.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kinit/series
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kinit/start_kdeinit-path.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kio/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kio/samba-search-path.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kio/series
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kitemmodels.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kitemviews.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kjobwidgets.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kjs.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kjsembed.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kmediaplayer.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/knewstuff.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/knotifications.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/knotifyconfig.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kpackage/allow-external-paths.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kpackage/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kpackage/qdiriterator-follow-symlinks.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kpackage/series
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kparts.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kpeople.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kplotting.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kpty.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kross.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/krunner.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kservice/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kservice/no-canonicalize-path.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kservice/qdiriterator-follow-symlinks.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kservice/series
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/ktexteditor/no-qcoreapplication.patch
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/ktexteditor/series
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/ktextwidgets.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kunitconversion.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kwallet.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kwayland.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kwidgetsaddons.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kwindowsystem.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kxmlgui.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/kxmlrpcclient.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/modemmanager-qt.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/networkmanager-qt.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/oxygen-icons5.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/plasma-framework.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/solid.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/sonnet.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/srcs.nix
rename to 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
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks/threadweaver.nix
rename to pkgs/development/libraries/kde-frameworks/threadweaver.nix
diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 24b4c749853d..8401e9f0d3de 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -42,7 +42,7 @@ let
       inherit src;
 
       propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
-      nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig self.qmakeHook ];
+      nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.qmakeHook ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
@@ -113,7 +113,6 @@ let
       ];
 
       makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
-      fixQtModuleCMakeConfig = makeSetupHook { } ./fix-qt-module-cmake-config.sh;
       qmakeHook = makeSetupHook { substitutions = { qt_dev = qtbase.dev; lndir = pkgs.xorg.lndir; }; } ./qmake-hook.sh;
 
     };
diff --git a/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh b/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh
deleted file mode 100644
index 7ca3e33b613c..000000000000
--- a/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-fixQtModuleCMakeConfig() {
-    local module="$1"
-    sed -e "/set(imported_location/ s@\\\${_qt5${module}_install_prefix}@${!outputLib}@" \
-        -i "${!outputDev}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake"
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch
new file mode 100644
index 000000000000..63c4ab7256a6
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch
@@ -0,0 +1,321 @@
+Index: qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
+ endif()
+ !!ENDIF
+ 
+-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
+-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
+-!!ELSE
+-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
+-# Use original install prefix when loaded through a
+-# cross-prefix symbolic link such as /lib -> /usr/lib.
+-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
+-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
+-if(_realCurr STREQUAL _realOrig)
+-    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
+-else()
+-    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
+-endif()
+-unset(_realOrig)
+-unset(_realCurr)
+-unset(_IMPORT_PREFIX)
+-!!ENDIF
+-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
+-!!ELSE
+-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
+-!!ENDIF
+-
+ !!IF !equals(TEMPLATE, aux)
+ # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
+ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
+     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+ 
+ !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
++    set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
++    endif()
+ !!ELSE
+     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
+ !!ENDIF
+@@ -74,45 +53,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
+         \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
+     )
+ 
+-!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
+-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
+-!!ELSE
+-    set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
+-!!ENDIF
+-    _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
+-    if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
+-        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
+-        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
+-        )
+-    endif()
+-!!ENDIF
+ endmacro()
+ !!ENDIF
+ 
+ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ 
+ !!IF !no_module_headers
+-!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
+-    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
+-      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
+-      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
+-    )
+-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
+-    )
+-!!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+-!!ENDIF
+-!!ELSE
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+-    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
++    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR\" \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
+ !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
++        \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
++        \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ENDIF
+-!!ENDIF
++
+ !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
+     include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
+ !!ENDIF
+@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+ 
+ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
+ !!IF isEmpty(CMAKE_DEBUG_TYPE)
+-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
+-    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
+-        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
+-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
+     if (EXISTS
+ !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
++        \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
+ !!ELSE
+         \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
+ !!ENDIF
+       AND EXISTS
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
++        \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+ !!ELSE
+         \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+ !!ENDIF
+         _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
+     endif()
+ !!ENDIF // CMAKE_DEBUG_TYPE
+ !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
+@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+ !!ENDIF // CMAKE_RELEASE_TYPE
+ 
+ !!IF !isEmpty(CMAKE_DEBUG_TYPE)
+-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+-    _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
+-!!ELSE
+     _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
+ 
+ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
+ !!IF isEmpty(CMAKE_RELEASE_TYPE)
+-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
+-    if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
+-        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
+-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
+     if (EXISTS
+ !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
++        \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
+ !!ELSE
+         \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
+ !!ENDIF
+       AND EXISTS
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
++        \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+ !!ELSE
+         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+ !!ENDIF
+         _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
+     endif()
+ !!ENDIF // CMAKE_RELEASE_TYPE
+ !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
+@@ -329,7 +259,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+ 
+ !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
+-        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
++        set(imported_location \"@NIX_OUT@/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
+ !!ELSE
+         set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.0.orig/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
++++ qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
+@@ -2,7 +2,7 @@
+ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
+ 
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
++set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\")
+ !!ELSE
+ set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
+ !!ENDIF
+@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert
+     set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+ 
+ !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
++    set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
+ !!ENDIF
+ 
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
++    set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
+ !!ELSE
+     set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.0.orig/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in
++++ qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
+     add_executable(Qt5::uic IMPORTED)
+ 
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in
++++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in
+@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
+     add_executable(Qt5::qmake IMPORTED)
+ 
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
+     add_executable(Qt5::moc IMPORTED)
+ 
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
+     add_executable(Qt5::rcc IMPORTED)
+ 
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain)
+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
+     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
+ !!ENDIF
+@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain)
+     set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+ 
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
++++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+@@ -1,6 +1,6 @@
+ 
+ !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
+-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
+ !!ELSE
+ set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
++++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+@@ -1,6 +1,6 @@
+ 
+ !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
+-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
+ !!ELSE
+ set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
+ !!ENDIF
+Index: qtbase-opensource-src-5.6.0/src/qtbase/dbus/Qt5DBusConfigExtras.cmake.in
+===================================================================
+--- qtbase-opensource-src-5.6.0.orig/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in
++++ qtbase-opensource-src-5.6.0/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in
+@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
+     add_executable(Qt5::qdbuscpp2xml IMPORTED)
+ 
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
+     add_executable(Qt5::qdbusxml2cpp IMPORTED)
+ 
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
++    set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+     set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index fcd870163074..ef64a87d0e28 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, copyPathsToStore, fixQtModuleCMakeConfig
+{ stdenv, lib, fetchurl, copyPathsToStore
 , srcs
 
 , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
@@ -213,11 +213,19 @@ stdenv.mkDerivation {
     # FIXME: move to the main list on rebuild.
     ++ [gnome_vfs.out libgnomeui.out gtk GConf];
 
-  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir patchelf perl pkgconfig python ];
+  nativeBuildInputs = [ lndir patchelf perl pkgconfig python ];
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
 
+  postInstall = ''
+    find "$out" -name "*.cmake" | while read file; do
+        substituteInPlace "$file" \
+            --subst-var-by NIX_OUT "$out" \
+            --subst-var-by NIX_DEV "$dev"
+    done
+  '';
+
   preFixup = ''
     # We cannot simply set these paths in configureFlags because libQtCore retains
     # references to the paths it was built with.
@@ -229,17 +237,6 @@ stdenv.mkDerivation {
     mkdir -p "$dev/share"
     moveToOutput "share/doc" "$dev"
 
-    # Move libtool archives and qmake projects
-    if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
-        pushd "''${!outputLib}"
-        find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \
-            while read -r file; do
-                mkdir -p "''${!outputDev}/$(dirname "$file")"
-                mv "''${!outputLib}/$file" "''${!outputDev}/$file"
-            done
-        popd
-    fi
-
     # Move the QGtkStyle plugin to the gtk output
     mkdir -p "$gtk/lib/qt5/plugins/platformthemes"
     mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes"
@@ -262,18 +259,16 @@ stdenv.mkDerivation {
       # Don't retain build-time dependencies like gdb and ruby.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
 
-      fixQtModuleCMakeConfig "Concurrent"
-      fixQtModuleCMakeConfig "Core"
-      fixQtModuleCMakeConfig "DBus"
-      fixQtModuleCMakeConfig "Gui"
-      fixQtModuleCMakeConfig "Network"
-      fixQtModuleCMakeConfig "OpenGL"
-      fixQtModuleCMakeConfig "OpenGLExtensions"
-      fixQtModuleCMakeConfig "PrintSupport"
-      fixQtModuleCMakeConfig "Sql"
-      fixQtModuleCMakeConfig "Test"
-      fixQtModuleCMakeConfig "Widgets"
-      fixQtModuleCMakeConfig "Xml"
+      # Move libtool archives and qmake projects
+      if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
+          pushd "''${!outputLib}"
+          find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \
+              while read -r file; do
+                  mkdir -p "''${!outputDev}/$(dirname "$file")"
+                  mv "''${!outputLib}/$file" "''${!outputDev}/$file"
+              done
+          popd
+      fi
     '';
 
   inherit lndir;
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/series b/pkgs/development/libraries/qt-5/5.5/qtbase/series
index 2196d8383752..1dfd8ac2683c 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/series
@@ -7,3 +7,4 @@ xdg-config-dirs.patch
 nix-profiles-library-paths.patch
 compose-search-path.patch
 libressl.patch
+cmake-paths.patch
\ No newline at end of file
diff --git a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
index 35538c7261f1..95cd6fea79b4 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
@@ -3,8 +3,4 @@
 qtSubmodule {
   name = "qtconnectivity";
   qtInputs = [ qtbase qtdeclarative ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Bluetooth"
-    fixQtModuleCMakeConfig "Nfc"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
index 407513f78498..328d8aee72bd 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
@@ -5,10 +5,4 @@ qtSubmodule {
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
   nativeBuildInputs = [ python ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Qml"
-    fixQtModuleCMakeConfig "Quick"
-    fixQtModuleCMakeConfig "QuickTest"
-    fixQtModuleCMakeConfig "QuickWidgets"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
index 503a0f7ce4f5..b860a73ef890 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
@@ -3,7 +3,4 @@
 qtSubmodule {
   name = "qtenginio";
   qtInputs = [ qtdeclarative ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Enginio"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
index bd11d4816ff3..1e134057c4b4 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
@@ -3,7 +3,4 @@
 qtSubmodule {
   name = "qtlocation";
   qtInputs = [ qtbase qtmultimedia ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Positioning"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
index 9eb68ba6b5ba..7c1cc5da07e3 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
@@ -9,8 +9,4 @@ qtSubmodule {
     pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
   ];
   qmakeFlags = [ "GST_VERSION=1.0" ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Multimedia"
-    fixQtModuleCMakeConfig "MultimediaWidgets"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
index 4bf92fa01473..64937b3dcd37 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
@@ -4,7 +4,4 @@ qtSubmodule {
   name = "qtquick1";
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Declarative"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
index b81a43aeadb0..127766e2ebd6 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
@@ -4,7 +4,4 @@ qtSubmodule {
   name = "qtscript";
   qtInputs = [ qtbase qttools ];
   patches = [ ./0001-glib-2.32.patch ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Script"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
index 5776f45a7068..61e64dc47e4d 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
@@ -3,7 +3,4 @@
 qtSubmodule {
   name = "qtsensors";
   qtInputs = [ qtbase qtdeclarative ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Sensors"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
index 3f409f9c0e08..32549c95344a 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
@@ -9,7 +9,4 @@ qtSubmodule {
       libudev = libudev.out;
     })
   ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "SerialPort"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
index a460d6da4c2a..b9ccac7cf933 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
@@ -3,7 +3,4 @@
 qtSubmodule {
   name = "qtsvg";
   qtInputs = [ qtbase ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Svg"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qttools.nix b/pkgs/development/libraries/qt-5/5.5/qttools.nix
index 1472691c5254..47ebd17c08f6 100644
--- a/pkgs/development/libraries/qt-5/5.5/qttools.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qttools.nix
@@ -6,11 +6,5 @@ qtSubmodule {
   postFixup = ''
     moveToOutput "bin/qdbus" "$out"
     moveToOutput "bin/qtpaths" "$out"
-
-    fixQtModuleCMakeConfig "Designer"
-    fixQtModuleCMakeConfig "Help"
-    fixQtModuleCMakeConfig "LinguistTools"
-    fixQtModuleCMakeConfig "UiPlugin"
-    fixQtModuleCMakeConfig "UiTools"
   '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
index b441a2448d76..2e92391f4c08 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
@@ -31,8 +31,4 @@ qtSubmodule {
         };
     in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
     ++ [ dlopen-webkit-udev ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "WebKit"
-    fixQtModuleCMakeConfig "WebKitWidgets"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
index c0d0f9e7d714..fbdfbbcf0dbe 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
@@ -3,7 +3,4 @@
 qtSubmodule {
   name = "qtwebsockets";
   qtInputs = [ qtbase qtdeclarative ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "WebSockets"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
index db92f1353627..a765161e2d7e 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
@@ -3,7 +3,4 @@
 qtSubmodule {
   name = "qtx11extras";
   qtInputs = [ qtbase ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "X11Extras"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
index 3b22132e4c38..9a8ddbba2bd2 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
@@ -3,7 +3,4 @@
 qtSubmodule {
   name = "qtxmlpatterns";
   qtInputs = [ qtbase ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "XmlPatterns"
-  '';
 }
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-ecm.patch b/pkgs/tools/inputmethods/fcitx/fcitx-ecm.patch
deleted file mode 100644
index 8a886f2bc78e..000000000000
--- a/pkgs/tools/inputmethods/fcitx/fcitx-ecm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd54ad8..ebb33d0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,8 +5,7 @@ project(fcitx)
- set(version 4.2.9)
- 
- 
--find_package(ECM 0.0.11 REQUIRED NO_MODULE)
--set(CMAKE_MODULE_PATH "${ECM_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
-+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
- set(CMAKE_AUTOMOC_RELAXED_MODE TRUE)
- 
- set_property(GLOBAL PROPERTY "__FCITX_INTERNAL_BUILD" On)
---- a/cmake/FindXKBCommon.cmake
-+++ b/cmake/FindXKBCommon.cmake
-@@ -1,5 +1,5 @@
- 
--include(ECMFindModuleHelpersStub)
-+include(ECMFindModuleHelpers)
- 
- ecm_find_package_version_check(XKBCommon)
- 
--- 
-2.8.0
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
index fc9dd1e6a253..3f421e327d71 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, kde5 }:
+{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }:
 
 stdenv.mkDerivation rec {
   name = "fcitx-qt5-${version}";
@@ -9,19 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "1pj1b04n8r4kl7jh1qdv0xshgzb3zrmizfa3g5h3yk589h191vwc";
   };
 
-  # The following is to not have a dependency on kde5 so the plugin can be part of qt5LibsFun
-  postUnpack = ''
-    ${lib.concatMapStrings (f: ''
-      ln -s ${kde5.extra-cmake-modules}/share/ECM/modules/${f} $sourceRoot/cmake/
-    '')
-    [ "ECMFindModuleHelpers.cmake" "ECMGenerateHeaders.cmake"
-      "ECMPackageConfigHelpers.cmake" "ECMQueryQmake.cmake"
-      "ECMSetupVersion.cmake" "ECMVersionHeader.h.in" ]}
-  '';
+  nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
 
-  patches = [ ./fcitx-qt5-ecm.patch ];
-
-  buildInputs = [ cmake fcitx pkgconfig qtbase ];
+  buildInputs = [ fcitx qtbase ];
 
   preInstall = ''
     substituteInPlace platforminputcontext/cmake_install.cmake \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c12931974315..df427a8379d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9114,7 +9114,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 { };
 
@@ -9134,6 +9139,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 {
@@ -9158,7 +9169,7 @@ in
       ffmpeg = ffmpeg_2;
     });
 
-  };
+  } // kdeFrameworks;
 
   qtEnv = qt5.env;
   qt5Full = qt5.full;
@@ -16308,12 +16319,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;
@@ -16356,14 +16361,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;