summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@users.noreply.github.com>2016-06-01 02:49:26 +0200
committerJoachim Fasting <joachifm@users.noreply.github.com>2016-06-01 02:49:26 +0200
commit5134bfab0c29d0ea70d394b06b1b887b32c7f1f6 (patch)
tree18ae045ff50da82a412651f9ce0439ee0027fc05 /pkgs
parented6c82614bbd5d82fd321e9671ca1d3dd711c8c0 (diff)
parentf67c8782417f0004b99da6baf942d17559f6ece2 (diff)
downloadnixpkgs-5134bfab0c29d0ea70d394b06b1b887b32c7f1f6.tar
nixpkgs-5134bfab0c29d0ea70d394b06b1b887b32c7f1f6.tar.gz
nixpkgs-5134bfab0c29d0ea70d394b06b1b887b32c7f1f6.tar.bz2
nixpkgs-5134bfab0c29d0ea70d394b06b1b887b32c7f1f6.tar.lz
nixpkgs-5134bfab0c29d0ea70d394b06b1b887b32c7f1f6.tar.xz
nixpkgs-5134bfab0c29d0ea70d394b06b1b887b32c7f1f6.tar.zst
nixpkgs-5134bfab0c29d0ea70d394b06b1b887b32c7f1f6.zip
Merge pull request #15872 from romildo/fix.mate
mate-themes and mate-icon-theme: move to pkgs/desktops/mate/
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/desktops/mate/default.nix2
-rw-r--r--pkgs/desktops/mate/mate-icon-theme/default.nix (renamed from pkgs/misc/themes/mate-icon-theme/default.nix)0
-rw-r--r--pkgs/desktops/mate/mate-themes/default.nix (renamed from pkgs/misc/themes/mate-themes/default.nix)0
-rw-r--r--pkgs/top-level/all-packages.nix4
4 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 8758e5a286d..c3a49011c1d 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,5 +1,7 @@
 { callPackage, pkgs }:
 rec {
   mate-common = callPackage ./mate-common { };
+  mate-icon-theme = callPackage ./mate-icon-theme { };
   mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
+  mate-themes = callPackage ./mate-themes { };
 }
diff --git a/pkgs/misc/themes/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index f68c8b403ee..f68c8b403ee 100644
--- a/pkgs/misc/themes/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
diff --git a/pkgs/misc/themes/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index bc622ef3729..bc622ef3729 100644
--- a/pkgs/misc/themes/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 651bf0bd917..1377f1b958e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15768,10 +15768,6 @@ in
 
   gnome_themes_standard = gnome3.gnome_themes_standard;
 
-  mate-icon-theme = callPackage ../misc/themes/mate-icon-theme { };
-
-  mate-themes = callPackage ../misc/themes/mate-themes { };
-
   numix-gtk-theme = callPackage ../misc/themes/numix-gtk-theme { };
 
   kde5PackagesFun = self: with self; {