From 6717617247b4e8a436d714fb31de06b28f909622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 1 Mar 2018 09:17:58 -0300
Subject: [PATCH 1/3] deepin: add meta package for the Deepin Desktop
 Environment (DDE)

---
 pkgs/desktops/deepin/default.nix | 10 ++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/desktops/deepin/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
new file mode 100644
index 000000000000..b2a98f85652b
--- /dev/null
+++ b/pkgs/desktops/deepin/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, newScope }:
+
+let
+  callPackage = newScope self;
+
+  self = rec {
+  
+  };
+
+in self
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e92cac440e93..60a09473126f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19201,6 +19201,8 @@ with pkgs;
 
   clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { };
 
+  deepin = recurseIntoAttrs (callPackage ../desktops/deepin { });
+
   enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment {
     callPackage = newScope pkgs.enlightenment;
   });

From c0a27fb0059837155ad3e04d8747eedfffa8e0a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 1 Mar 2018 09:53:56 -0300
Subject: [PATCH 2/3] deepin-terminal: move to deepin meta package

---
 .../misc => desktops/deepin}/deepin-terminal/default.nix   | 0
 pkgs/desktops/deepin/default.nix                           | 7 ++++++-
 pkgs/tools/networking/zssh/default.nix                     | 4 ++--
 pkgs/top-level/all-packages.nix                            | 5 -----
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/{applications/misc => desktops/deepin}/deepin-terminal/default.nix (100%)

diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
similarity index 100%
rename from pkgs/applications/misc/deepin-terminal/default.nix
rename to pkgs/desktops/deepin/deepin-terminal/default.nix
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index b2a98f85652b..7e48a55d3702 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -4,7 +4,12 @@ let
   callPackage = newScope self;
 
   self = rec {
-  
+
+    deepin-terminal = callPackage ./deepin-terminal {
+      inherit (pkgs.gnome3) libgee vte;
+      wnck = pkgs.libwnck3;
+    };
+
   };
 
 in self
diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix
index 16c0034e46fc..ac64e135c2fe 100644
--- a/pkgs/tools/networking/zssh/default.nix
+++ b/pkgs/tools/networking/zssh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline, deepin-terminal }:
+{ stdenv, fetchurl, readline, deepin }:
 
 let
   version = "1.5c";
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
     description = "SSH and Telnet client with ZMODEM file transfer capability";
     homepage = http://zssh.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2;
-    maintainers = deepin-terminal.meta.maintainers; # required by deepin-terminal
+    maintainers = deepin.deepin-terminal.meta.maintainers; # required by deepin-terminal
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60a09473126f..08f5b0875280 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17644,11 +17644,6 @@ with pkgs;
     vte = gnome3.vte;
   };
 
-  deepin-terminal = callPackage ../applications/misc/deepin-terminal {
-    inherit (gnome3) libgee vte;
-    wnck = libwnck3;
-  };
-
   termite = callPackage ../applications/misc/termite {
     vte = gnome3.vte-ng;
   };

From 562031d815102fece3060ae767921a169a4ece2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 1 Mar 2018 10:00:05 -0300
Subject: [PATCH 3/3] deepin-gtk-theme: move to deepin meta package

---
 .../deepin => desktops/deepin/deepin-gtk-theme}/default.nix     | 0
 pkgs/desktops/deepin/default.nix                                | 2 ++
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{misc/themes/deepin => desktops/deepin/deepin-gtk-theme}/default.nix (100%)

diff --git a/pkgs/misc/themes/deepin/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
similarity index 100%
rename from pkgs/misc/themes/deepin/default.nix
rename to pkgs/desktops/deepin/deepin-gtk-theme/default.nix
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 7e48a55d3702..012851485c90 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -5,6 +5,8 @@ let
 
   self = rec {
 
+    deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
+
     deepin-terminal = callPackage ./deepin-terminal {
       inherit (pkgs.gnome3) libgee vte;
       wnck = pkgs.libwnck3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08f5b0875280..bdb53a63deb6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19265,8 +19265,6 @@ with pkgs;
 
   orion = callPackage ../misc/themes/orion {};
 
-  deepin-gtk-theme = callPackage ../misc/themes/deepin { };
-
   elementary-gtk-theme = callPackage ../misc/themes/elementary { };
 
   albatross = callPackage ../misc/themes/albatross { };