50 files changed, 101 insertions, 101 deletions
diff --git a/pkgs/desktops/kde-5/applications/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix
index 7acfa3a230b..7acfa3a230b 100644
--- a/pkgs/desktops/kde-5/applications/akonadi-contacts.nix
+++ b/pkgs/applications/kde/akonadi-contacts.nix
diff --git a/pkgs/desktops/kde-5/applications/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
index 26e1559c779..26e1559c779 100644
--- a/pkgs/desktops/kde-5/applications/akonadi-mime.nix
+++ b/pkgs/applications/kde/akonadi-mime.nix
diff --git a/pkgs/desktops/kde-5/applications/akonadi.nix b/pkgs/applications/kde/akonadi.nix
index 03483e5ec0d..03483e5ec0d 100644
--- a/pkgs/desktops/kde-5/applications/akonadi.nix
+++ b/pkgs/applications/kde/akonadi.nix
diff --git a/pkgs/desktops/kde-5/applications/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index 6b471614f5a..6b471614f5a 100644
--- a/pkgs/desktops/kde-5/applications/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
diff --git a/pkgs/desktops/kde-5/applications/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix
index f6f3a7ce14e..f6f3a7ce14e 100644
--- a/pkgs/desktops/kde-5/applications/baloo-widgets.nix
+++ b/pkgs/applications/kde/baloo-widgets.nix
diff --git a/pkgs/desktops/kde-5/applications/kde-app.nix b/pkgs/applications/kde/build-support/application.nix
index 92fdb439330..92fdb439330 100644
--- a/pkgs/desktops/kde-5/applications/kde-app.nix
+++ b/pkgs/applications/kde/build-support/application.nix
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
new file mode 100644
index 00000000000..e638378ddbb
--- /dev/null
+++ b/pkgs/applications/kde/default.nix
@@ -0,0 +1,95 @@
+/*
+
+# New packages
+
+READ THIS FIRST
+
+This module is for official packages in the KDE Applications Bundle. All
+available packages are listed in `./srcs.nix`, although some are not yet
+packaged in Nixpkgs (see below).
+
+IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
+
+Many of the packages released upstream are not yet built in Nixpkgs due to lack
+of demand. To add a Nixpkgs build for an upstream package, copy one of the
+existing packages here and modify it as necessary. A simple example package that
+still shows most of the available features is in `./gwenview.nix`.
+
+# Updates
+
+1. Update the URL in `./fetch.sh`.
+2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications`
+   from the top of the Nixpkgs tree.
+3. Use `nox-review wip` to check that everything builds.
+4. Commit the changes and open a pull request.
+
+*/
+
+{
+  stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs,
+  kdeDerivation, plasma5,
+  attica, phonon,
+  debug ? false,
+}:
+
+let
+  mirror = "mirror://kde";
+  srcs = import ./srcs.nix { inherit fetchurl mirror; };
+in
+
+let
+
+  packages = self: with self;
+    let
+      callPackage = self.newScope {
+        kdeApp = import ./build-support/application.nix {
+          inherit lib kdeDerivation;
+          inherit debug srcs;
+        };
+      };
+    in {
+      kdelibs = callPackage ./kdelibs { inherit attica phonon; };
+      akonadi = callPackage ./akonadi.nix {};
+      akonadi-contacts = callPackage ./akonadi-contacts.nix {};
+      akonadi-mime = callPackage ./akonadi-mime.nix {};
+      ark = callPackage ./ark/default.nix {};
+      baloo-widgets = callPackage ./baloo-widgets.nix {};
+      dolphin = callPackage ./dolphin.nix {};
+      dolphin-plugins = callPackage ./dolphin-plugins.nix {};
+      ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
+      filelight = callPackage ./filelight.nix {};
+      gwenview = callPackage ./gwenview.nix {};
+      kate = callPackage ./kate.nix {};
+      kdenlive = callPackage ./kdenlive.nix {};
+      kcalc = callPackage ./kcalc.nix {};
+      kcolorchooser = callPackage ./kcolorchooser.nix {};
+      kcontacts = callPackage ./kcontacts.nix {};
+      kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
+      kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
+      kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
+      kdf = callPackage ./kdf.nix {};
+      kgpg = callPackage ./kgpg.nix {};
+      khelpcenter = callPackage ./khelpcenter.nix {};
+      kig = callPackage ./kig.nix {};
+      kio-extras = callPackage ./kio-extras.nix {};
+      kmime = callPackage ./kmime.nix {};
+      kmix = callPackage ./kmix.nix {};
+      kompare = callPackage ./kompare.nix {};
+      konsole = callPackage ./konsole.nix {};
+      kwalletmanager = callPackage ./kwalletmanager.nix {};
+      libkdcraw = callPackage ./libkdcraw.nix {};
+      libkexiv2 = callPackage ./libkexiv2.nix {};
+      libkipi = callPackage ./libkipi.nix {};
+      libkomparediff2 = callPackage ./libkomparediff2.nix {};
+      marble = callPackage ./marble.nix {};
+      okteta = callPackage ./okteta.nix {};
+      okular = callPackage ./okular.nix {};
+      print-manager = callPackage ./print-manager.nix {};
+      spectacle = callPackage ./spectacle.nix {
+        inherit (plasma5) kscreen;
+      };
+
+      l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; });
+    };
+
+in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/kde-5/applications/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix
index e9932adc5dc..e9932adc5dc 100644
--- a/pkgs/desktops/kde-5/applications/dolphin-plugins.nix
+++ b/pkgs/applications/kde/dolphin-plugins.nix
diff --git a/pkgs/desktops/kde-5/applications/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index 9be40e9439b..9be40e9439b 100644
--- a/pkgs/desktops/kde-5/applications/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/applications/kde/fetch.sh
index 607a16eb45b..607a16eb45b 100644
--- a/pkgs/desktops/kde-5/applications/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
diff --git a/pkgs/desktops/kde-5/applications/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix
index c063b1e6035..c063b1e6035 100644
--- a/pkgs/desktops/kde-5/applications/ffmpegthumbs.nix
+++ b/pkgs/applications/kde/ffmpegthumbs.nix
diff --git a/pkgs/desktops/kde-5/applications/filelight.nix b/pkgs/applications/kde/filelight.nix
index e3d9172145c..e3d9172145c 100644
--- a/pkgs/desktops/kde-5/applications/filelight.nix
+++ b/pkgs/applications/kde/filelight.nix
diff --git a/pkgs/desktops/kde-5/applications/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 37a1605fe70..37a1605fe70 100644
--- a/pkgs/desktops/kde-5/applications/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
diff --git a/pkgs/desktops/kde-5/applications/kate.nix b/pkgs/applications/kde/kate.nix
index 03cc0e1fe33..03cc0e1fe33 100644
--- a/pkgs/desktops/kde-5/applications/kate.nix
+++ b/pkgs/applications/kde/kate.nix
diff --git a/pkgs/desktops/kde-5/applications/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 10164692f77..10164692f77 100644
--- a/pkgs/desktops/kde-5/applications/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
diff --git a/pkgs/desktops/kde-5/applications/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix
index 1dc6ccbc44c..1dc6ccbc44c 100644
--- a/pkgs/desktops/kde-5/applications/kcolorchooser.nix
+++ b/pkgs/applications/kde/kcolorchooser.nix
diff --git a/pkgs/desktops/kde-5/applications/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index 441d73d363d..441d73d363d 100644
--- a/pkgs/desktops/kde-5/applications/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
diff --git a/pkgs/desktops/kde-5/applications/kde-locale-4.nix b/pkgs/applications/kde/kde-locale-4.nix
index e83794c60d8..e83794c60d8 100644
--- a/pkgs/desktops/kde-5/applications/kde-locale-4.nix
+++ b/pkgs/applications/kde/kde-locale-4.nix
diff --git a/pkgs/desktops/kde-5/applications/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix
index 2b9cc0e35eb..2b9cc0e35eb 100644
--- a/pkgs/desktops/kde-5/applications/kde-locale-5.nix
+++ b/pkgs/applications/kde/kde-locale-5.nix
diff --git a/pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix
index 984524dc1b2..984524dc1b2 100644
--- a/pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix
+++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix
diff --git a/pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix
index c3947226690..c3947226690 100644
--- a/pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix
+++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix
diff --git a/pkgs/desktops/kde-5/applications/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch
index b7d7300e9a8..b7d7300e9a8 100644
--- a/pkgs/desktops/kde-5/applications/kdelibs/0001-old-kde4-cmake-policies.patch
+++ b/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch
diff --git a/pkgs/desktops/kde-5/applications/kdelibs/0002-polkit-install-path.patch b/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch
index ff0306ea148..ff0306ea148 100644
--- a/pkgs/desktops/kde-5/applications/kdelibs/0002-polkit-install-path.patch
+++ b/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch
diff --git a/pkgs/desktops/kde-5/applications/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch
index a79d7b2b7d1..a79d7b2b7d1 100644
--- a/pkgs/desktops/kde-5/applications/kdelibs/0003-remove_xdg_impurities.patch
+++ b/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch
diff --git a/pkgs/desktops/kde-5/applications/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix
index c7c8c250a83..0292b51a48d 100644
--- a/pkgs/desktops/kde-5/applications/kdelibs/default.nix
+++ b/pkgs/applications/kde/kdelibs/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, src, version,
+  kdeApp, lib,
   automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
   attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
   libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
diff --git a/pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix
index 4aa11967528..4aa11967528 100644
--- a/pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix
+++ b/pkgs/applications/kde/kdenetwork-filesharing.nix
diff --git a/pkgs/desktops/kde-5/applications/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 071ec21bbd0..071ec21bbd0 100644
--- a/pkgs/desktops/kde-5/applications/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
diff --git a/pkgs/desktops/kde-5/applications/kdf.nix b/pkgs/applications/kde/kdf.nix
index c73eadc1df4..c73eadc1df4 100644
--- a/pkgs/desktops/kde-5/applications/kdf.nix
+++ b/pkgs/applications/kde/kdf.nix
diff --git a/pkgs/desktops/kde-5/applications/kgpg.nix b/pkgs/applications/kde/kgpg.nix
index cd462acdf2b..cd462acdf2b 100644
--- a/pkgs/desktops/kde-5/applications/kgpg.nix
+++ b/pkgs/applications/kde/kgpg.nix
diff --git a/pkgs/desktops/kde-5/applications/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
index 3f13d131c77..3f13d131c77 100644
--- a/pkgs/desktops/kde-5/applications/khelpcenter.nix
+++ b/pkgs/applications/kde/khelpcenter.nix
diff --git a/pkgs/desktops/kde-5/applications/kig.nix b/pkgs/applications/kde/kig.nix
index 9636f82974b..9636f82974b 100644
--- a/pkgs/desktops/kde-5/applications/kig.nix
+++ b/pkgs/applications/kde/kig.nix
diff --git a/pkgs/desktops/kde-5/applications/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix
index fe3e3fad200..fe3e3fad200 100644
--- a/pkgs/desktops/kde-5/applications/kio-extras.nix
+++ b/pkgs/applications/kde/kio-extras.nix
diff --git a/pkgs/desktops/kde-5/applications/kmime.nix b/pkgs/applications/kde/kmime.nix
index d60909ec7bc..d60909ec7bc 100644
--- a/pkgs/desktops/kde-5/applications/kmime.nix
+++ b/pkgs/applications/kde/kmime.nix
diff --git a/pkgs/desktops/kde-5/applications/kmix.nix b/pkgs/applications/kde/kmix.nix
index 46a67e06ee0..46a67e06ee0 100644
--- a/pkgs/desktops/kde-5/applications/kmix.nix
+++ b/pkgs/applications/kde/kmix.nix
diff --git a/pkgs/desktops/kde-5/applications/kompare.nix b/pkgs/applications/kde/kompare.nix
index 45789edbfcc..45789edbfcc 100644
--- a/pkgs/desktops/kde-5/applications/kompare.nix
+++ b/pkgs/applications/kde/kompare.nix
diff --git a/pkgs/desktops/kde-5/applications/konsole.nix b/pkgs/applications/kde/konsole.nix
index 2dfd305b46b..2dfd305b46b 100644
--- a/pkgs/desktops/kde-5/applications/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
diff --git a/pkgs/desktops/kde-5/applications/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix
index 03c2ab3853a..03c2ab3853a 100644
--- a/pkgs/desktops/kde-5/applications/kwalletmanager.nix
+++ b/pkgs/applications/kde/kwalletmanager.nix
diff --git a/pkgs/desktops/kde-5/applications/l10n.nix b/pkgs/applications/kde/l10n.nix
index f2e5f843b5d..87e7a82ce46 100644
--- a/pkgs/desktops/kde-5/applications/l10n.nix
+++ b/pkgs/applications/kde/l10n.nix
@@ -1,4 +1,4 @@
-{ callPackage, pkgs, lib }:
+{ callPackage, recurseIntoAttrs, lib }:
 
 let
 
@@ -7,7 +7,7 @@ let
 
 in
 
-lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
+lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
   ar = {
     qt4 = callPackage (kdeLocale4 "ar" {}) {};
     qt5 = callPackage (kdeLocale5 "ar" {}) {};
diff --git a/pkgs/desktops/kde-5/applications/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix
index 421f7dbb4cf..421f7dbb4cf 100644
--- a/pkgs/desktops/kde-5/applications/libkdcraw.nix
+++ b/pkgs/applications/kde/libkdcraw.nix
diff --git a/pkgs/desktops/kde-5/applications/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix
index 0fac0759ab6..0fac0759ab6 100644
--- a/pkgs/desktops/kde-5/applications/libkexiv2.nix
+++ b/pkgs/applications/kde/libkexiv2.nix
diff --git a/pkgs/desktops/kde-5/applications/libkipi.nix b/pkgs/applications/kde/libkipi.nix
index fa9dcc8323d..fa9dcc8323d 100644
--- a/pkgs/desktops/kde-5/applications/libkipi.nix
+++ b/pkgs/applications/kde/libkipi.nix
diff --git a/pkgs/desktops/kde-5/applications/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix
index 91b469fed3c..91b469fed3c 100644
--- a/pkgs/desktops/kde-5/applications/libkomparediff2.nix
+++ b/pkgs/applications/kde/libkomparediff2.nix
diff --git a/pkgs/desktops/kde-5/applications/marble.nix b/pkgs/applications/kde/marble.nix
index 5b8a82dbf09..5b8a82dbf09 100644
--- a/pkgs/desktops/kde-5/applications/marble.nix
+++ b/pkgs/applications/kde/marble.nix
diff --git a/pkgs/desktops/kde-5/applications/okteta.nix b/pkgs/applications/kde/okteta.nix
index 6683b9876fc..6683b9876fc 100644
--- a/pkgs/desktops/kde-5/applications/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
diff --git a/pkgs/desktops/kde-5/applications/okular.nix b/pkgs/applications/kde/okular.nix
index 499e8cc9368..499e8cc9368 100644
--- a/pkgs/desktops/kde-5/applications/okular.nix
+++ b/pkgs/applications/kde/okular.nix
diff --git a/pkgs/desktops/kde-5/applications/print-manager.nix b/pkgs/applications/kde/print-manager.nix
index c4a82780b44..c4a82780b44 100644
--- a/pkgs/desktops/kde-5/applications/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
diff --git a/pkgs/desktops/kde-5/applications/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index 4c3a5246b2e..4c3a5246b2e 100644
--- a/pkgs/desktops/kde-5/applications/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/applications/kde/srcs.nix
index 60c412e55fd..60c412e55fd 100644
--- a/pkgs/desktops/kde-5/applications/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
deleted file mode 100644
index 832b88c7e80..00000000000
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-
-# New packages
-
-READ THIS FIRST
-
-This module is for official packages in the KDE Applications Bundle. All
-available packages are listed in `./srcs.nix`, although some are not yet
-packaged in Nixpkgs (see below).
-
-IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
-
-Many of the packages released upstream are not yet built in Nixpkgs due to lack
-of demand. To add a Nixpkgs build for an upstream package, copy one of the
-existing packages here and modify it as necessary. A simple example package that
-still shows most of the available features is in `./gwenview.nix`.
-
-# Updates
-
-1. Update the URL in `./fetch.sh`.
-2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications`
-   from the top of the Nixpkgs tree.
-3. Use `nox-review wip` to check that everything builds.
-4. Commit the changes and open a pull request.
-
-*/
-
-{
-  stdenv, lib, libsForQt5, fetchurl,
-  kdeDerivation, plasma5,
-  attica, phonon,
-  debug ? false,
-}:
-
-let
-
-  mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit fetchurl mirror; };
-
-  packages = self: with self; {
-
-    kdeApp = import ./kde-app.nix {
-      inherit lib kdeDerivation;
-      inherit debug srcs;
-    };
-
-    kdelibs = callPackage ./kdelibs {
-      inherit (srcs.kdelibs) src version;
-      inherit attica phonon;
-    };
-
-    akonadi = callPackage ./akonadi.nix {};
-    akonadi-contacts = callPackage ./akonadi-contacts.nix {};
-    akonadi-mime = callPackage ./akonadi-mime.nix {};
-    ark = callPackage ./ark/default.nix {};
-    baloo-widgets = callPackage ./baloo-widgets.nix {};
-    dolphin = callPackage ./dolphin.nix {};
-    dolphin-plugins = callPackage ./dolphin-plugins.nix {};
-    ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
-    filelight = callPackage ./filelight.nix {};
-    gwenview = callPackage ./gwenview.nix {};
-    kate = callPackage ./kate.nix {};
-    kdenlive = callPackage ./kdenlive.nix {};
-    kcalc = callPackage ./kcalc.nix {};
-    kcolorchooser = callPackage ./kcolorchooser.nix {};
-    kcontacts = callPackage ./kcontacts.nix {};
-    kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
-    kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
-    kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
-    kdf = callPackage ./kdf.nix {};
-    kgpg = callPackage ./kgpg.nix {};
-    khelpcenter = callPackage ./khelpcenter.nix {};
-    kig = callPackage ./kig.nix {};
-    kio-extras = callPackage ./kio-extras.nix {};
-    kmime = callPackage ./kmime.nix {};
-    kmix = callPackage ./kmix.nix {};
-    kompare = callPackage ./kompare.nix {};
-    konsole = callPackage ./konsole.nix {};
-    kwalletmanager = callPackage ./kwalletmanager.nix {};
-    libkdcraw = callPackage ./libkdcraw.nix {};
-    libkexiv2 = callPackage ./libkexiv2.nix {};
-    libkipi = callPackage ./libkipi.nix {};
-    libkomparediff2 = callPackage ./libkomparediff2.nix {};
-    marble = callPackage ./marble.nix {};
-    okteta = callPackage ./okteta.nix {};
-    okular = callPackage ./okular.nix {};
-    print-manager = callPackage ./print-manager.nix {};
-    spectacle = callPackage ./spectacle.nix {
-      inherit (plasma5) kscreen;
-    };
-
-    l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
-  };
-
-in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d310c50e035..297aae6147e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14055,11 +14055,11 @@ with pkgs;
 
   kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {};
 
-  kdeApplications = import ../desktops/kde-5/applications {
-    inherit stdenv lib libsForQt5 fetchurl;
+  kdeApplications = recurseIntoAttrs (import ../applications/kde {
+    inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs;
     inherit kdeDerivation plasma5;
     inherit attica phonon;
-  };
+  });
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };