From 6750d3cbdd596505c54ffda9da634f0b39b1f0e0 Mon Sep 17 00:00:00 2001
From: linsui <linsui@inbox.lv>
Date: Mon, 14 Aug 2023 16:52:30 +0800
Subject: fcitx5-with-addons: add withConfigtool option

---
 pkgs/tools/inputmethods/fcitx5/with-addons.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools/inputmethods')

diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
index 9268147b96be8..e2870dc1f561b 100644
--- a/pkgs/tools/inputmethods/fcitx5/with-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
@@ -2,6 +2,7 @@
 , symlinkJoin
 , makeBinaryWrapper
 , fcitx5
+, withConfigtool ? true
 , fcitx5-configtool
 , fcitx5-qt
 , fcitx5-gtk
@@ -11,7 +12,13 @@
 symlinkJoin {
   name = "fcitx5-with-addons-${fcitx5.version}";
 
-  paths = [ fcitx5 fcitx5-configtool fcitx5-qt fcitx5-gtk ] ++ addons;
+  paths = [
+    fcitx5
+    fcitx5-qt
+    fcitx5-gtk
+  ] ++ lib.optionals withConfigtool [
+    fcitx5-configtool
+  ] ++ addons;
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 
@@ -22,7 +29,7 @@ symlinkJoin {
       --suffix PATH : "$out/bin" \
       --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.flatten (map (x: x.extraLdLibraries or []) addons))}"
 
-    ${lib.optionalString (fcitx5-configtool != null)''
+    ${lib.optionals withConfigtool ''
       # Configtool call libexec/fcitx5-qt5-gui-wrapper for gui addons in FCITX_ADDON_DIRS
       wrapProgram $out/bin/fcitx5-config-qt --prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5"
     ''}
-- 
cgit 1.4.1