From 95264632ae8e3f5dac6ef101386f9de618413db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 7 Jun 2022 08:52:19 -0300 Subject: [PATCH 1/3] matcha-gtk-theme: reformat nix expression (cherry picked from commit f88c65a5db54b9553cb6c3452093d1d194da06ea) --- pkgs/data/themes/matcha/default.nix | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 4d59a03313a4..20d5a3db8719 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib +, stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, librsvg +}: stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; @@ -11,13 +17,21 @@ stdenv.mkDerivation rec { sha256 = "1wgq1aypm4cjv7yavlfmqcwahlddvh2gbg2f5ca0djgnpy9vha1g"; }; - buildInputs = [ gdk-pixbuf librsvg ]; + buildInputs = [ + gdk-pixbuf + librsvg + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + postPatch = '' + patchShebangs . + ''; installPhase = '' runHook preInstall - patchShebangs . mkdir -p $out/share/themes name= ./install.sh -d $out/share/themes install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml @@ -27,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A stylish flat design theme for GTK based desktop environments"; + description = "A stylish flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/theme-matcha"; license = licenses.gpl3Only; platforms = platforms.unix; From ad1a4528140afc50fb4730ea054cf3184632c0bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 7 Jun 2022 08:53:51 -0300 Subject: [PATCH 2/3] matcha-gtk-theme: add update script (cherry picked from commit 647c7bc2f29ac4f91fef510342e16956d33f1361) --- pkgs/data/themes/matcha/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 20d5a3db8719..9c5f84403181 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -4,6 +4,7 @@ , gdk-pixbuf , gtk-engine-murrine , librsvg +, gitUpdater }: stdenv.mkDerivation rec { @@ -40,6 +41,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater {inherit pname version; }; + meta = with lib; { description = "A stylish flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/theme-matcha"; From a02bbf01ecd3a75738746ef09d94178857014e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 7 Jun 2022 08:55:23 -0300 Subject: [PATCH 3/3] matcha-gtk-theme: 2021-12-25 -> 2022-06-07 (cherry picked from commit 025ddc1ec3e247c7e488177153b2c8157ebe5521) --- pkgs/data/themes/matcha/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 9c5f84403181..dcf6988f5939 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-12-25"; + version = "2022-06-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1wgq1aypm4cjv7yavlfmqcwahlddvh2gbg2f5ca0djgnpy9vha1g"; + sha256 = "26xa9EGo2hci08Zw+X/A0Pn0VHxU8yfvRMiRusml+tc="; }; buildInputs = [ @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs . + patchShebangs install.sh ''; installPhase = '' runHook preInstall mkdir -p $out/share/themes - name= ./install.sh -d $out/share/themes + name= ./install.sh --dest $out/share/themes install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml mkdir -p $out/share/doc/${pname} cp -a src/extra/firefox $out/share/doc/${pname}