From dd915395c46f1ffd890d4e23adb633d8c9fa238e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 24 Dec 2018 18:04:05 -0200
Subject: [PATCH 1/2] matcha: 2018-11-12 -> 2018-12-24

---
 pkgs/misc/themes/matcha/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/misc/themes/matcha/default.nix
index d76e0ed74c5..edb1113a696 100644
--- a/pkgs/misc/themes/matcha/default.nix
+++ b/pkgs/misc/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "matcha-${version}";
-  version = "2018-11-12";
+  version = "2018-12-24";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "matcha";
     rev = version;
-    sha256 = "04alnwb3r0546y7xk2lx8bsdm47q6j89vld3g19rfb3622iv85la";
+    sha256 = "178y5s5jfprkw8y6clqb8ss4kvfswivfrh6cn67fk4z7wg72i3yc";
   };
 
   buildInputs = [ gdk_pixbuf librsvg ];
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     patchShebangs .
-    substituteInPlace Install --replace '$HOME/.themes' "$out/share/themes"
-    ./Install
+    mkdir -p $out/share/themes
+    name= ./Install -d $out/share/themes
     install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml
   '';
 

From 5b1fb4941608cd1f3fcc36cd9a7a3a368c997c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 24 Dec 2018 18:10:13 -0200
Subject: [PATCH 2/2] matcha: move to pkgs/data/themes

---
 pkgs/{misc => data}/themes/matcha/default.nix | 0
 pkgs/top-level/all-packages.nix               | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{misc => data}/themes/matcha/default.nix (100%)

diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
similarity index 100%
rename from pkgs/misc/themes/matcha/default.nix
rename to pkgs/data/themes/matcha/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e0f19b4ab4..d8708e4e354 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15600,6 +15600,8 @@ in
 
   man-pages = callPackage ../data/documentation/man-pages { };
 
+  matcha = callPackage ../data/themes/matcha { };
+
   materia-theme = callPackage ../data/themes/materia-theme { };
 
   material-icons = callPackage ../data/fonts/material-icons { };
@@ -22404,8 +22406,6 @@ in
 
   martyr = callPackage ../development/libraries/martyr { };
 
-  matcha = callPackage ../misc/themes/matcha { };
-
   mess = callPackage ../misc/emulators/mess {
     inherit (pkgs.gnome2) GConf;
   };