From b604ac857ebb5bea254bbfc7feb7b5a709f32e29 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Sun, 18 May 2025 01:08:17 +0200 Subject: [PATCH 1/2] catppuccin-fcitx5: 0-unstable-2025-03-22 -> 0-unstable-2025-05-16 --- pkgs/by-name/ca/catppuccin-fcitx5/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin-fcitx5/package.nix b/pkgs/by-name/ca/catppuccin-fcitx5/package.nix index d062438f5e48..07af8309f261 100644 --- a/pkgs/by-name/ca/catppuccin-fcitx5/package.nix +++ b/pkgs/by-name/ca/catppuccin-fcitx5/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation { pname = "catppuccin-fcitx5"; - version = "0-unstable-2025-03-22"; + version = "0-unstable-2025-05-16"; src = fetchFromGitHub { owner = "catppuccin"; repo = "fcitx5"; - rev = "383c27ac46cbb55aa5f58acbd32841c1ed3a78a0"; - hash = "sha256-n83f9ge4UhBFlgCPRCXygcVJiDp7st48lAJHTm1ohR4="; + rev = "393845cf3ed0e0000bfe57fe1b9ad75748e2547f"; + hash = "sha256-ss0kW+ulvMhxeZKBrjQ7E5Cya+02eJrGsE4OLEkqKks="; }; dontConfigure = true; From b485c52e8f98cc87afdcad84e1c1b89a0f4b7182 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Sun, 18 May 2025 15:43:41 +0200 Subject: [PATCH 2/2] catppuccin-fcitx5: add rounded corners support I'm not really sure if this is the *best* way to do this per se, but it works for now --- pkgs/by-name/ca/catppuccin-fcitx5/package.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin-fcitx5/package.nix b/pkgs/by-name/ca/catppuccin-fcitx5/package.nix index 07af8309f261..ef769a011d05 100644 --- a/pkgs/by-name/ca/catppuccin-fcitx5/package.nix +++ b/pkgs/by-name/ca/catppuccin-fcitx5/package.nix @@ -3,6 +3,8 @@ stdenvNoCC, fetchFromGitHub, unstableGitUpdater, + + withRoundedCorners ? false, }: stdenvNoCC.mkDerivation { pname = "catppuccin-fcitx5"; @@ -18,12 +20,19 @@ stdenvNoCC.mkDerivation { dontConfigure = true; dontBuild = true; - installPhase = '' - runHook preInstall - mkdir -p $out/share/fcitx5 - cp -r src $out/share/fcitx5/themes - runHook postInstall - ''; + installPhase = + '' + runHook preInstall + '' + + lib.optionalString withRoundedCorners '' + find src -name theme.conf -exec sed -iE 's/^# (Image=(panel|highlight).svg)/\1/' {} + + '' + + '' + mkdir -p $out/share/fcitx5 + cp -r src $out/share/fcitx5/themes + + runHook postInstall + ''; passthru.updateScript = unstableGitUpdater { };