diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-06-15 00:02:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-15 00:02:12 +0000 |
commit | 4e74812c3a21428f0719dcdd393d8d07811238ae (patch) | |
tree | facff4b97c267c2b4dfd1c1f0722137e211a4d50 /pkgs/data | |
parent | 34bc19a1dc1418e87b53326f1b331825daa795a0 (diff) | |
parent | 8f5ceec1d89e7e0c6b5b5e020ac5cccbd87427e8 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/themes/matcha/default.nix | 33 | ||||
-rw-r--r-- | pkgs/data/themes/mojave/default.nix | 12 |
2 files changed, 34 insertions, 11 deletions
diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 4d59a03313a4f..dcf6988f5939e 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -1,33 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib +, stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, librsvg +, gitUpdater +}: 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 = [ gdk-pixbuf librsvg ]; + buildInputs = [ + gdk-pixbuf + librsvg + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + postPatch = '' + patchShebangs install.sh + ''; installPhase = '' runHook preInstall - patchShebangs . 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} runHook postInstall ''; + passthru.updateScript = gitUpdater {inherit pname version; }; + 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; diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index e8e98ab0ebfef..4fc9b0ab8c024 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchurl , glib +, gnome-shell , gtk-engine-murrine , gtk_engines , inkscape @@ -30,14 +31,14 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink stdenv.mkDerivation rec { inherit pname; - version = "2022-05-12"; + version = "2022-06-07"; srcs = [ (fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-VrrxW16J+S21qBoAeVCWs0Q6bRL1jXAK7MOBpdSMJZY="; + sha256 = "sha256-OEqB2PSZ5KoxXAUhlyT1PRUzckVz+jTCIoAqP8gVqTk="; }) ] ++ @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib + gnome-shell inkscape jdupes optipng @@ -72,7 +74,10 @@ stdenv.mkDerivation rec { dontRewriteSymlinks = true; postPatch = '' - patchShebangs . + patchShebangs \ + install.sh \ + src/main/gtk-3.0/make_gresource_xml.sh \ + src/main/gtk-4.0/make_gresource_xml.sh for f in \ render-assets.sh \ @@ -87,6 +92,7 @@ stdenv.mkDerivation rec { src/assets/metacity-1/render-assets.sh \ src/assets/xfwm4/render-assets.sh do + patchShebangs $f substituteInPlace $f \ --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ --replace /usr/bin/optipng ${optipng}/bin/optipng |