summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-03-04 04:11:43 +0000
committerGitHub <noreply@github.com>2018-03-04 04:11:43 +0000
commit2eed814b6c56de994e0ab09c4c835bc5eddcebcc (patch)
tree02db5dd7c9d52a8bd8a93a779f3d69bec056752f
parent7f3dab453d38638daaf193e62c1858029d17529d (diff)
parentc714c92d7938fc376a336026778a7bd6ac19c776 (diff)
Merge pull request #36277 from romildo/deepin
deepin-icon-theme: move to deepin meta package
-rw-r--r--pkgs/desktops/deepin/deepin-icon-theme/default.nix (renamed from pkgs/data/icons/deepin-icon-theme/default.nix)0
-rw-r--r--pkgs/desktops/deepin/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/data/icons/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
index 7a422beb9924d..7a422beb9924d 100644
--- a/pkgs/data/icons/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 012851485c901..b03349ce2dff7 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -7,6 +7,8 @@ let
 
     deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
 
+    deepin-icon-theme = callPackage ./deepin-icon-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 186e75e60ddef..9f1750b2b10d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13968,8 +13968,6 @@ with pkgs;
 
   crimson = callPackage ../data/fonts/crimson {};
 
-  deepin-icon-theme = callPackage ../data/icons/deepin-icon-theme { };
-
   dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {
     inherit (perlPackages) FontTTF;
   });