1 files changed, 83 insertions, 81 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 00965bd0a582d..2906dc7888653 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -24,87 +24,89 @@ existing packages here and modify it as necessary.
 
 */
 
-{ newScope, kdeDerivation, lib, fetchurl }:
+{ libsForQt5, kdeDerivation, lib, fetchurl }:
 
 let
-  callPackage = newScope {
-    kdeFramework = import ./build-support/framework.nix {
-      inherit kdeDerivation lib fetchurl;
+  packages = self: with self;
+    let
+      callPackage = self.newScope {
+        kdeFramework = import ./build-support/framework.nix {
+          inherit kdeDerivation lib fetchurl;
+        };
+      };
+    in {
+      attica = callPackage ./attica.nix {};
+      baloo = callPackage ./baloo.nix {};
+      bluez-qt = callPackage ./bluez-qt.nix {};
+      breeze-icons = callPackage ./breeze-icons.nix {};
+      extra-cmake-modules = callPackage ./extra-cmake-modules {};
+      frameworkintegration = callPackage ./frameworkintegration.nix {};
+      kactivities = callPackage ./kactivities.nix {};
+      kactivities-stats = callPackage ./kactivities-stats.nix {};
+      kapidox = callPackage ./kapidox.nix {};
+      karchive = callPackage ./karchive.nix {};
+      kauth = callPackage ./kauth {};
+      kbookmarks = callPackage ./kbookmarks.nix {};
+      kcmutils = callPackage ./kcmutils {};
+      kcodecs = callPackage ./kcodecs.nix {};
+      kcompletion = callPackage ./kcompletion.nix {};
+      kconfig = callPackage ./kconfig.nix {};
+      kconfigwidgets = callPackage ./kconfigwidgets {};
+      kcoreaddons = callPackage ./kcoreaddons.nix {};
+      kcrash = callPackage ./kcrash.nix {};
+      kdbusaddons = callPackage ./kdbusaddons.nix {};
+      kdeclarative = callPackage ./kdeclarative.nix {};
+      kded = callPackage ./kded.nix {};
+      kdelibs4support = callPackage ./kdelibs4support {};
+      kdesignerplugin = callPackage ./kdesignerplugin.nix {};
+      kdesu = callPackage ./kdesu.nix {};
+      kdnssd = callPackage ./kdnssd.nix {};
+      kdoctools = callPackage ./kdoctools {};
+      kemoticons = callPackage ./kemoticons.nix {};
+      kfilemetadata = callPackage ./kfilemetadata {};
+      kglobalaccel = callPackage ./kglobalaccel.nix {};
+      kguiaddons = callPackage ./kguiaddons.nix {};
+      khtml = callPackage ./khtml.nix {};
+      ki18n = callPackage ./ki18n.nix {};
+      kiconthemes = callPackage ./kiconthemes {};
+      kidletime = callPackage ./kidletime.nix {};
+      kimageformats = callPackage ./kimageformats.nix {};
+      kinit = callPackage ./kinit {};
+      kio = callPackage ./kio {};
+      kitemmodels = callPackage ./kitemmodels.nix {};
+      kitemviews = callPackage ./kitemviews.nix {};
+      kjobwidgets = callPackage ./kjobwidgets.nix {};
+      kjs = callPackage ./kjs.nix {};
+      kjsembed = callPackage ./kjsembed.nix {};
+      kmediaplayer = callPackage ./kmediaplayer.nix {};
+      knewstuff = callPackage ./knewstuff.nix {};
+      knotifications = callPackage ./knotifications.nix {};
+      knotifyconfig = callPackage ./knotifyconfig.nix {};
+      kpackage = callPackage ./kpackage {};
+      kparts = callPackage ./kparts.nix {};
+      kpeople = callPackage ./kpeople.nix {};
+      kplotting = callPackage ./kplotting.nix {};
+      kpty = callPackage ./kpty.nix {};
+      kross = callPackage ./kross.nix {};
+      krunner = callPackage ./krunner.nix {};
+      kservice = callPackage ./kservice {};
+      ktexteditor = callPackage ./ktexteditor.nix {};
+      ktextwidgets = callPackage ./ktextwidgets.nix {};
+      kunitconversion = callPackage ./kunitconversion.nix {};
+      kwallet = callPackage ./kwallet.nix {};
+      kwayland = callPackage ./kwayland.nix {};
+      kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
+      kwindowsystem = callPackage ./kwindowsystem.nix {};
+      kxmlgui = callPackage ./kxmlgui.nix {};
+      kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
+      modemmanager-qt = callPackage ./modemmanager-qt.nix {};
+      networkmanager-qt = callPackage ./networkmanager-qt.nix {};
+      oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
+      plasma-framework = callPackage ./plasma-framework.nix {};
+      solid = callPackage ./solid.nix {};
+      sonnet = callPackage ./sonnet.nix {};
+      syntax-highlighting = callPackage ./syntax-highlighting.nix {};
+      threadweaver = callPackage ./threadweaver.nix {};
     };
-  };
-in
-{
-  attica = callPackage ./attica.nix {};
-  baloo = callPackage ./baloo.nix {};
-  bluez-qt = callPackage ./bluez-qt.nix {};
-  breeze-icons = callPackage ./breeze-icons.nix {};
-  ecm = callPackage ./extra-cmake-modules {};
-  ecmNoHooks = callPackage ./extra-cmake-modules/no-hooks.nix { };
-  frameworkintegration = callPackage ./frameworkintegration.nix {};
-  kactivities = callPackage ./kactivities.nix {};
-  kactivities-stats = callPackage ./kactivities-stats.nix {};
-  kapidox = callPackage ./kapidox.nix {};
-  karchive = callPackage ./karchive.nix {};
-  kauth = callPackage ./kauth {};
-  kbookmarks = callPackage ./kbookmarks.nix {};
-  kcmutils = callPackage ./kcmutils {};
-  kcodecs = callPackage ./kcodecs.nix {};
-  kcompletion = callPackage ./kcompletion.nix {};
-  kconfig = callPackage ./kconfig.nix {};
-  kconfigwidgets = callPackage ./kconfigwidgets {};
-  kcoreaddons = callPackage ./kcoreaddons.nix {};
-  kcrash = callPackage ./kcrash.nix {};
-  kdbusaddons = callPackage ./kdbusaddons.nix {};
-  kdeclarative = callPackage ./kdeclarative.nix {};
-  kded = callPackage ./kded.nix {};
-  kdelibs4support = callPackage ./kdelibs4support {};
-  kdesignerplugin = callPackage ./kdesignerplugin.nix {};
-  kdesu = callPackage ./kdesu.nix {};
-  kdnssd = callPackage ./kdnssd.nix {};
-  kdoctools = callPackage ./kdoctools {};
-  kemoticons = callPackage ./kemoticons.nix {};
-  kfilemetadata = callPackage ./kfilemetadata {};
-  kglobalaccel = callPackage ./kglobalaccel.nix {};
-  kguiaddons = callPackage ./kguiaddons.nix {};
-  khtml = callPackage ./khtml.nix {};
-  ki18n = callPackage ./ki18n.nix {};
-  kiconthemes = callPackage ./kiconthemes {};
-  kidletime = callPackage ./kidletime.nix {};
-  kimageformats = callPackage ./kimageformats.nix {};
-  kinit = callPackage ./kinit {};
-  kio = callPackage ./kio {};
-  kitemmodels = callPackage ./kitemmodels.nix {};
-  kitemviews = callPackage ./kitemviews.nix {};
-  kjobwidgets = callPackage ./kjobwidgets.nix {};
-  kjs = callPackage ./kjs.nix {};
-  kjsembed = callPackage ./kjsembed.nix {};
-  kmediaplayer = callPackage ./kmediaplayer.nix {};
-  knewstuff = callPackage ./knewstuff.nix {};
-  knotifications = callPackage ./knotifications.nix {};
-  knotifyconfig = callPackage ./knotifyconfig.nix {};
-  kpackage = callPackage ./kpackage {};
-  kparts = callPackage ./kparts.nix {};
-  kpeople = callPackage ./kpeople.nix {};
-  kplotting = callPackage ./kplotting.nix {};
-  kpty = callPackage ./kpty.nix {};
-  kross = callPackage ./kross.nix {};
-  krunner = callPackage ./krunner.nix {};
-  kservice = callPackage ./kservice {};
-  ktexteditor = callPackage ./ktexteditor.nix {};
-  ktextwidgets = callPackage ./ktextwidgets.nix {};
-  kunitconversion = callPackage ./kunitconversion.nix {};
-  kwallet = callPackage ./kwallet.nix {};
-  kwayland = callPackage ./kwayland.nix {};
-  kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
-  kwindowsystem = callPackage ./kwindowsystem.nix {};
-  kxmlgui = callPackage ./kxmlgui.nix {};
-  kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
-  modemmanager-qt = callPackage ./modemmanager-qt.nix {};
-  networkmanager-qt = callPackage ./networkmanager-qt.nix {};
-  oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
-  plasma-framework = callPackage ./plasma-framework.nix {};
-  solid = callPackage ./solid.nix {};
-  sonnet = callPackage ./sonnet.nix {};
-  syntax-highlighting = callPackage ./syntax-highlighting.nix {};
-  threadweaver = callPackage ./threadweaver.nix {};
-}
+
+in lib.makeScope libsForQt5.newScope packages