From 5c221d0b000658832b3c99d4f3eceadfb82edf29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 30 May 2016 15:29:09 -0300
Subject: [PATCH 1/2] mate-common: init at 1.14.1
---
pkgs/desktops/mate/default.nix | 4 ++++
pkgs/desktops/mate/mate-common/default.nix | 21 +++++++++++++++++++++
pkgs/top-level/all-packages.nix | 4 ++++
3 files changed, 29 insertions(+)
create mode 100644 pkgs/desktops/mate/default.nix
create mode 100644 pkgs/desktops/mate/mate-common/default.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
new file mode 100644
index 000000000000..bf0050a4ec2f
--- /dev/null
+++ b/pkgs/desktops/mate/default.nix
@@ -0,0 +1,4 @@
+{ callPackage, pkgs }:
+rec {
+ mate-common = callPackage ./mate-common { };
+}
diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
new file mode 100644
index 000000000000..2f95043097d0
--- /dev/null
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "mate-common-${version}";
+ version = "${major-ver}.${minor-ver}";
+ major-ver = "1.14";
+ minor-ver = "0";
+
+ src = fetchurl {
+ url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+ sha256 = "1xkcwn3w6vrgnkcw7mcvihrsqclpkbqqxs1ivj4cq0dkqrm1kdq4";
+ };
+
+ meta = {
+ description = "Common files for development of MATE packages";
+ homepage = "http://mate-desktop.org";
+ license = stdenv.lib.licenses.gpl3;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.romildo ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a05669559bd..1a44a7a4bd04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15730,6 +15730,10 @@ in
in makeOverridable makePackages extra;
+ mate = recurseIntoAttrs (callPackage ../desktops/mate {
+ callPackage = newScope pkgs.mate;
+ });
+
pantheon = recurseIntoAttrs rec {
callPackage = newScope pkgs.pantheon;
pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
From f5dff2cd1479d5c2ade97060dee26384ed1355f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 30 May 2016 15:30:37 -0300
Subject: [PATCH 2/2] mate-icon-theme-faenza: init at 1.14.1
---
pkgs/desktops/mate/default.nix | 1 +
.../mate/mate-icon-theme-faenza/default.nix | 25 +++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 100644 pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index bf0050a4ec2f..8758e5a286dd 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,4 +1,5 @@
{ callPackage, pkgs }:
rec {
mate-common = callPackage ./mate-common { };
+ mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
}
diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
new file mode 100644
index 000000000000..941b730d7544
--- /dev/null
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, autoreconfHook, mate, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+ name = "mate-icon-theme-faenza-${version}";
+ version = "${major-ver}.${minor-ver}";
+ major-ver = "1.14";
+ minor-ver = "0";
+
+ src = fetchurl {
+ url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+ sha256 = "115rbw4rbk8jqbjpbh5bfqjzsbwj5723r6cw96b1xrq1dv4gy4nr";
+ };
+
+ nativeBuildInputs = [ autoreconfHook mate.mate-common ];
+
+ buildInputs = [ hicolor_icon_theme ];
+
+ meta = {
+ description = "Faenza icon theme from MATE";
+ homepage = "http://mate-desktop.org";
+ license = stdenv.lib.licenses.gpl2;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.romildo ];
+ };
+}