Remove top-level kde5 attribute

- There is no such thing as KDE 5

2 files changed, 25 insertions, 20 deletions

diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index 3284b2709c86..a53bbedc2c54 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -20,31 +20,34 @@ still shows most of the available features is in `./gwenview.nix`.
 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. Invoke `nix-build -A kde5` and ensure that everything builds.
+3. Use `nox-review wip` to check that everything builds.
 4. Commit the changes and open a pull request.
 
 */
 
-{ pkgs, debug ? false }:
+{
+  stdenv, lib, libsForQt5, fetchurl,
+  plasma5,
+  attica, phonon,
+  debug ? false,
+}:
 
 let
 
-  inherit (pkgs) lib stdenv;
-
   mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+  srcs = import ./srcs.nix { inherit fetchurl mirror; };
 
   packages = self: with self; {
 
     kdeApp = import ./kde-app.nix {
       inherit lib;
       inherit debug srcs;
-      inherit kdeDerivation;
+      inherit (libsForQt5) kdeDerivation;
     };
 
     kdelibs = callPackage ./kdelibs {
       inherit (srcs.kdelibs) src version;
-      inherit (pkgs) attica phonon;
+      inherit attica phonon;
     };
 
     akonadi = callPackage ./akonadi.nix {};
@@ -54,9 +57,7 @@ let
     baloo-widgets = callPackage ./baloo-widgets.nix {};
     dolphin = callPackage ./dolphin.nix {};
     dolphin-plugins = callPackage ./dolphin-plugins.nix {};
-    ffmpegthumbs = callPackage ./ffmpegthumbs.nix {
-      ffmpeg = pkgs.ffmpeg_2;
-    };
+    ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
     filelight = callPackage ./filelight.nix {};
     gwenview = callPackage ./gwenview.nix {};
     kate = callPackage ./kate.nix {};
@@ -85,9 +86,11 @@ let
     okteta = callPackage ./okteta.nix {};
     okular = callPackage ./okular.nix {};
     print-manager = callPackage ./print-manager.nix {};
-    spectacle = callPackage ./spectacle.nix {};
+    spectacle = callPackage ./spectacle.nix {
+      inherit (plasma5) kscreen;
+    };
 
     l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
   };
 
-in packages
+in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix
index 3ac1c51848e9..e42a543ea23d 100644
--- a/pkgs/desktops/kde-5/plasma/default.nix
+++ b/pkgs/desktops/kde-5/plasma/default.nix
@@ -19,19 +19,21 @@ existing packages here and modify it as necessary.
 1. Update the URL in `./fetch.sh`.
 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/plasma`
    from the top of the Nixpkgs tree.
-3. Invoke `nix-build -A kde5` and ensure that everything builds.
+3. Use `nox-review wip` to check that everything builds.
 4. Commit the changes and open a pull request.
 
 */
 
-{ pkgs, debug ? false }:
+{
+  stdenv, lib, libsForQt5, makeSetupHook, symlinkJoin, fetchurl,
+  gconf,
+  debug ? false,
+}:
 
 let
 
-  inherit (pkgs) lib makeSetupHook stdenv symlinkJoin;
-
   mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+  srcs = import ./srcs.nix { inherit fetchurl mirror; };
 
   packages = self: with self; {
     plasmaPackage = args:
@@ -39,7 +41,7 @@ let
         inherit (args) name;
         sname = args.sname or name;
         inherit (srcs."${sname}") src version;
-      in kdeDerivation (args // {
+      in libsForQt5.kdeDerivation (args // {
         name = "${name}-${version}";
         inherit src;
 
@@ -86,7 +88,7 @@ let
     plasma-integration = callPackage ./plasma-integration.nix {};
     plasma-nm = callPackage ./plasma-nm {};
     plasma-pa = callPackage ./plasma-pa.nix {
-      inherit (pkgs.gnome3) gconf;
+      inherit gconf;
     };
     plasma-workspace = callPackage ./plasma-workspace {};
     plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
@@ -96,4 +98,4 @@ let
     systemsettings = callPackage ./systemsettings.nix {};
   };
 
-in packages
+in lib.makeScope libsForQt5.newScope packages