From 8e204beb08b45e4fdf29bcaa8b3b5295fd0a1c47 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 21 Jun 2024 00:28:55 +0800 Subject: [PATCH] catppuccin-gtk: use vendored colloid-gtk-theme We used to replace vendored colloid-gtk-theme with our nixpkgs version, but catppuccin-gtk has been archived, and its patches cannot be applied on recent version of colloid-gtk-theme, so we dropped it. We may deprecate catppuccin-gtk in favor of the catppuccin flavor of colloid-gtk-theme (which was introduced in 2024-06-18), but still needs some user feedback. --- pkgs/by-name/ca/catppuccin-gtk/package.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin-gtk/package.nix b/pkgs/by-name/ca/catppuccin-gtk/package.nix index 5bc1ffbcecab..db7a3295903b 100644 --- a/pkgs/by-name/ca/catppuccin-gtk/package.nix +++ b/pkgs/by-name/ca/catppuccin-gtk/package.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , gtk3 , git -, colloid-gtk-theme , python3 , sassc , nix-update-script @@ -34,7 +33,8 @@ stdenvNoCC.mkDerivation { owner = "catppuccin"; repo = "gtk"; rev = "v${version}"; - hash = "sha256-8KyZtZqVVz5UKuGdLrUsR2djD3nsJDliHMtvFtUVim8="; + fetchSubmodules = true; + hash = "sha256-q5/VcFsm3vNEw55zq/vcM11eo456SYE5TQA3g2VQjGc="; }; nativeBuildInputs = [ @@ -46,12 +46,6 @@ stdenvNoCC.mkDerivation { (python3.withPackages (ps: [ ps.catppuccin ])) ]; - postUnpack = '' - rm -rf source/sources/colloid - cp -r ${colloid-gtk-theme.src} source/sources/colloid - chmod -R +w source/sources/colloid - ''; - dontConfigure = true; dontBuild = true;