about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJosé Romildo Malaquias <malaquias@gmail.com>2018-03-01 09:53:56 -0300
committerJosé Romildo Malaquias <malaquias@gmail.com>2018-03-01 09:53:56 -0300
commitc0a27fb0059837155ad3e04d8747eedfffa8e0a7 (patch)
tree0e5118ba8322a026845c6b9871a0b5f2c9beb58b
parent6717617247b4e8a436d714fb31de06b28f909622 (diff)
downloadnixlib-c0a27fb0059837155ad3e04d8747eedfffa8e0a7.tar
nixlib-c0a27fb0059837155ad3e04d8747eedfffa8e0a7.tar.gz
nixlib-c0a27fb0059837155ad3e04d8747eedfffa8e0a7.tar.bz2
nixlib-c0a27fb0059837155ad3e04d8747eedfffa8e0a7.tar.lz
nixlib-c0a27fb0059837155ad3e04d8747eedfffa8e0a7.tar.xz
nixlib-c0a27fb0059837155ad3e04d8747eedfffa8e0a7.tar.zst
nixlib-c0a27fb0059837155ad3e04d8747eedfffa8e0a7.zip
deepin-terminal: move to deepin meta package
-rw-r--r--pkgs/desktops/deepin/deepin-terminal/default.nix (renamed from pkgs/applications/misc/deepin-terminal/default.nix)0
-rw-r--r--pkgs/desktops/deepin/default.nix7
-rw-r--r--pkgs/tools/networking/zssh/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix5
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 8e64fa698058..8e64fa698058 100644
--- a/pkgs/applications/misc/deepin-terminal/default.nix
+++ b/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;
   };