about summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2018-12-26 23:55:17 -0500
committerGitHub <noreply@github.com>2018-12-26 23:55:17 -0500
commit3cf8821ce3030a95845e7990c957393adf7c2f8c (patch)
treea9ffbb5310f57946376aa0c8f8c1fb11ff3413ed
parent3e6e9f563971391356e32a5041a816b5908433f3 (diff)
parent5b1fb4941608cd1f3fcc36cd9a7a3a368c997c77 (diff)
downloadnixlib-3cf8821ce3030a95845e7990c957393adf7c2f8c.tar
nixlib-3cf8821ce3030a95845e7990c957393adf7c2f8c.tar.gz
nixlib-3cf8821ce3030a95845e7990c957393adf7c2f8c.tar.bz2
nixlib-3cf8821ce3030a95845e7990c957393adf7c2f8c.tar.lz
nixlib-3cf8821ce3030a95845e7990c957393adf7c2f8c.tar.xz
nixlib-3cf8821ce3030a95845e7990c957393adf7c2f8c.tar.zst
nixlib-3cf8821ce3030a95845e7990c957393adf7c2f8c.zip
Merge pull request #52786 from romildo/upd.matcha
matcha: 2018-11-12 -> 2018-12-24
-rw-r--r--pkgs/data/themes/matcha/default.nix (renamed from pkgs/misc/themes/matcha/default.nix)8
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index d76e0ed74c5d..edb1113a6960 100644
--- a/pkgs/misc/themes/matcha/default.nix
+++ b/pkgs/data/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
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bda7c48682f4..b42a58c8a566 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;
   };