Merge branch 'master' into x-updates

pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
+
+stdenv.mkDerivation {
+  name = "gtk-engine-murrine-0.98.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/murrine/0.98/murrine-0.98.2.tar.xz";
+    sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9";
+  };
+
+  buildInputs = [ pkgconfig intltool gtk2 ];
+
+  meta = {
+    description = "A very flexible theme engine";
+    license = stdenv.lib.licenses.lgpl3;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/misc/themes/mate-icon-theme/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk2, iconnamingutils }:
+
+stdenv.mkDerivation {
+  name = "mate-icon-theme-1.6.1";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.1.tar.xz";
+    sha256 = "154x0mcsvjmz84vi94kjh8hpydny3ab9lbg58wxh1lskmbc2473x";
+  };
+
+  buildInputs = [ pkgconfig intltool gtk2 iconnamingutils ];
+
+  meta = {
+    description = "Icon themes from MATE";
+    homepage = "http://mate-desktop.org";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+}

pkgs/misc/themes/mate-themes/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
+
+stdenv.mkDerivation {
+  name = "mate-themes-1.6.1";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.1.tar.xz";
+    sha256 = "0lm2kvlwj0rpznb0n2g1sh1r6nz0p45i7flbnxivl9gi632wdmfp";
+  };
+
+  buildInputs = [ pkgconfig intltool iconnamingutils gtk2 ];
+
+  meta = {
+    description = "A set of themes from MATE";
+    homepage = "http://mate-desktop.org";
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+}