diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index a4e64aaee41..cb73bbddda7 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -24,16 +24,18 @@ existing packages here and modify it as necessary.
 
 */
 
-{ pkgs, debug ? false }:
+{
+  stdenv, lib, makeSetupHook, makeWrapper, fetchurl, buildEnv,
+  callPackage,
+  debug ? false
+}:
 
 let
 
-  inherit (pkgs) lib makeSetupHook stdenv;
-
   mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+  srcs = import ./srcs.nix { inherit fetchurl mirror; };
 
-  packages = self: with self; {
+  packages = rec {
 
     kdeDerivation = args:
       let
@@ -69,7 +71,7 @@ let
       });
 
     kdeWrapper = import ./kde-wrapper.nix {
-      inherit (pkgs) stdenv lib makeWrapper buildEnv;
+      inherit stdenv lib makeWrapper buildEnv;
     };
 
     attica = callPackage ./attica.nix {};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76bca805052..bb9f348e87e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9336,12 +9336,12 @@ with pkgs;
   qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
 
   mkLibsForQt5 = self: with self;
-    let kdeFrameworks =
-          import ../development/libraries/kde-frameworks { inherit pkgs; } self;
+    let kdeFrameworks = import ../development/libraries/kde-frameworks {
+          inherit stdenv lib makeSetupHook makeWrapper fetchurl buildEnv;
+          inherit (self) callPackage;
+        };
     in {
 
-    inherit kdeFrameworks;
-
     accounts-qt = callPackage ../development/libraries/accounts-qt { };
 
     fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };