kdeFrameworks: Hide internal kdeFramework deriver

3 files changed, 107 insertions, 105 deletions

diff --git a/pkgs/development/libraries/kde-frameworks/build-support/framework.nix b/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
new file mode 100644
index 000000000000..5b6f2cc4b26d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
@@ -0,0 +1,24 @@
+{ kdeDerivation, lib, fetchurl }:
+
+let
+  mirror = "mirror://kde";
+  srcs = import ../srcs.nix { inherit fetchurl mirror; };
+in
+
+args:
+
+let
+  inherit (args) name;
+  inherit (srcs."${name}") src version;
+in kdeDerivation (args // {
+  name = "${name}-${version}";
+  inherit src;
+
+  meta = {
+    license = with lib.licenses; [
+      lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+    ];
+    platforms = lib.platforms.linux;
+    homepage = "http://www.kde.org";
+  } // (args.meta or {});
+})
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index c5484dd6e8d4..00965bd0a582 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -24,109 +24,87 @@ existing packages here and modify it as necessary.
 
 */
 
-{
-  stdenv, lib, makeSetupHook, makeWrapper, fetchurl, buildEnv,
-  kdeDerivation, callPackage,
-  debug ? false
-}:
+{ newScope, kdeDerivation, lib, fetchurl }:
 
 let
-
-  mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit fetchurl mirror; };
-
-  packages = rec {
-
-    kdeFramework = args:
-      let
-        inherit (args) name;
-        inherit (srcs."${name}") src version;
-      in kdeDerivation (args // {
-        name = "${name}-${version}";
-        inherit src;
-
-        meta = {
-          license = with lib.licenses; [
-            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-          ];
-          platforms = lib.platforms.linux;
-          homepage = "http://www.kde.org";
-        } // (args.meta or {});
-      });
-
-    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 {};
+  callPackage = newScope {
+    kdeFramework = import ./build-support/framework.nix {
+      inherit kdeDerivation lib fetchurl;
+    };
   };
-
-in packages
+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 {};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15db1a7d7a6b..6204602e96a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9343,8 +9343,8 @@ with pkgs;
 
   mkLibsForQt5 = self: with self;
     let kdeFrameworks = import ../development/libraries/kde-frameworks {
-          inherit stdenv lib kdeDerivation makeSetupHook makeWrapper fetchurl buildEnv;
-          inherit (self) callPackage;
+          inherit (self) newScope;
+          inherit kdeDerivation lib fetchurl;
         };
     in {