diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix similarity index 79% rename from pkgs/misc/themes/matcha/default.nix rename to pkgs/data/themes/matcha/default.nix index d76e0ed74c5..edb1113a696 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 bda7c48682f..b42a58c8a56 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; };