pkgs/by-name/ca/catppuccin-gtk/fix-inconsistent-theme-name.patch

   1 The theme name uses `default` as fallback for tweaks when they aren't
   2 set, which not only is not a valid tweak name, but can lead to confusion
   3 and inconsistencies (See: https://github.com/catppuccin/nix/pull/261).
   4 ---
   5  sources/build/context.py | 4 +++-
   6  1 file changed, 3 insertions(+), 1 deletion(-)
   7
   8 diff --git a/sources/build/context.py b/sources/build/context.py
   9 index 3d43c01..6167f14 100644
  10 --- a/sources/build/context.py
  11 +++ b/sources/build/context.py
  12 @@ -45,7 +45,8 @@ class BuildContext:
  13          return f"{self.output_root}/{self.build_id()}"
  14
  15      def build_id(self) -> str:
  16 -        return f"{self.theme_name}-{self.flavor.identifier}-{self.accent.identifier}-{self.size}+{self.tweaks.id() or 'default'}"
  17 +        tweaks = f"+{self.tweaks.id()}" if self.tweaks.id() != "" else ""
  18 +        return f"{self.theme_name}-{self.flavor.identifier}-{self.accent.identifier}-{self.size}" + tweaks
  19
  20      def apply_suffix(self, suffix: Suffix) -> str:
  21          if suffix.test(self):
  22 @@ -59,6 +60,7 @@ class BuildContext:
  23              Subsitution(find=f"\\${key}: {default}", replace=f"${key}: {value}"),
  24          )
  25
  26 +
  27  IS_DARK = Suffix(true_value="-Dark", test=lambda ctx: ctx.flavor.dark)
  28  IS_LIGHT = Suffix(true_value="-Light", test=lambda ctx: not ctx.flavor.dark)
  29  IS_WINDOW_NORMAL = Suffix(
  30 --
  31 2.45.1
  32