kdeFrameworks: Hide internal kdeFramework deriver

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 {});
+})

pkgs/development/libraries/kde-frameworks/default.nix

@@ -24,42 +24,22 @@ existing packages here and modify it as necessary.
 
 */
 
-{
+{ newScope, kdeDerivation, lib, fetchurl }:
-  stdenv, lib, makeSetupHook, makeWrapper, fetchurl, buildEnv,
-  kdeDerivation, callPackage,
-  debug ? false
-}:
 
 let
-
+  callPackage = newScope {
-  mirror = "mirror://kde";
+    kdeFramework = import ./build-support/framework.nix {
-  srcs = import ./srcs.nix { inherit fetchurl mirror; };
+      inherit kdeDerivation lib fetchurl;
-
+    };
-  packages = rec {
+  };
-
+in
-    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 {};
+  ecmNoHooks = callPackage ./extra-cmake-modules/no-hooks.nix { };
   frameworkintegration = callPackage ./frameworkintegration.nix {};
   kactivities = callPackage ./kactivities.nix {};
   kactivities-stats = callPackage ./kactivities-stats.nix {};
@@ -127,6 +107,4 @@ let
   sonnet = callPackage ./sonnet.nix {};
   syntax-highlighting = callPackage ./syntax-highlighting.nix {};
   threadweaver = callPackage ./threadweaver.nix {};
-  };
+}
-
-in packages

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) newScope;
-          inherit (self) callPackage;
+          inherit kdeDerivation lib fetchurl;
         };
     in {