From 6a115a247c7f0a1283a1787cbd4554face376d94 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 26 Feb 2017 18:44:35 -0600
Subject: [PATCH] Export KDE packages at top level

---
 pkgs/applications/kde/default.nix |  4 +--
 pkgs/top-level/all-packages.nix   | 45 +++++++++++++++++++------------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index e638378ddbb..fff0df35d05 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -85,9 +85,7 @@ let
       okteta = callPackage ./okteta.nix {};
       okular = callPackage ./okular.nix {};
       print-manager = callPackage ./print-manager.nix {};
-      spectacle = callPackage ./spectacle.nix {
-        inherit (plasma5) kscreen;
-      };
+      spectacle = callPackage ./spectacle.nix {};
 
       l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; });
     };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cc37f01069..b46121b8c3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9356,7 +9356,7 @@ with pkgs;
     ### KDE FRAMEWORKS
 
     inherit (kdeFrameworks.override { libsForQt5 = self; })
-      attica baloo bluez-qt frameworkintegration kactivities kactivities-stats
+      attica baloo bluez-qt kactivities kactivities-stats
       karchive kauth kbookmarks kcmutils kcodecs kcompletion kconfig
       kconfigwidgets kcoreaddons kcrash kdbusaddons kdeclarative kdelibs4support
       kdesignerplugin kdnssd kemoticons kfilemetadata kglobalaccel kguiaddons
@@ -9371,7 +9371,7 @@ with pkgs;
     ### KDE PLASMA 5
 
     inherit (plasma5.override { libsForQt5 = self; })
-      kdecoration libkscreen libksysguard plasma-integration;
+      kdecoration khotkeys libkscreen libksysguard;
 
     ### KDE APPLICATIONS
 
@@ -14098,8 +14098,9 @@ with pkgs;
       recurseIntoAttrs (makeOverridable mkApplications attrs);
 
   inherit (kdeApplications)
-    ark dolphin filelight gwenview kate kdenlive kcalc kcolorchooser kgpg
-    khelpcenter kig konsole marble okteta okular spectacle;
+    akonadi ark dolphin ffmpegthumbs filelight gwenview kate
+    kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig konsole marble
+    okteta okular spectacle;
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 
@@ -16268,7 +16269,6 @@ with pkgs;
   dhewm3 = callPackage ../games/dhewm3 {};
 
   digikam = libsForQt5.callPackage ../applications/graphics/digikam {
-    inherit (kdeApplications) libkipi marble;
     inherit (plasma5) oxygen;
     boost = boost160;
   };
@@ -16854,18 +16854,6 @@ with pkgs;
     pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
   };
 
-  inherit (kdeFrameworks) kded kinit;
-
-  plasma5 =
-    let
-      mkPlasma5 = import ../desktops/plasma-5;
-      attrs = {
-        inherit libsForQt5 kdeDerivation lib fetchurl;
-        inherit (gnome3) gconf;
-      };
-    in
-      recurseIntoAttrs (makeOverridable mkPlasma5 attrs);
-
   redshift = callPackage ../applications/misc/redshift {
     inherit (python3Packages) python pygobject3 pyxdg;
   };
@@ -16895,6 +16883,29 @@ with pkgs;
 
   xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };
 
+  ### DESKTOP ENVIRONMENTS / PLASMA 5
+
+  plasma5 =
+    let
+      mkPlasma5 = import ../desktops/plasma-5;
+      attrs = {
+        inherit libsForQt5 kdeDerivation lib fetchurl;
+        inherit (gnome3) gconf;
+      };
+    in
+      recurseIntoAttrs (makeOverridable mkPlasma5 attrs);
+
+  inherit (kdeFrameworks) kded kinit frameworkintegration;
+
+  inherit (plasma5)
+    bluedevil breeze-gtk breeze-qt4 breeze-qt5 breeze-grub breeze-plymouth
+    kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
+    kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
+    kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop
+    plasma-integration plasma-nm plasma-pa plasma-workspace
+    plasma-workspace-wallpapers polkit-kde-agent powerdevil startkde
+    systemsettings;
+
   ### SCIENCE
 
   ### SCIENCE/GEOMETRY