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/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;