fcitx5-with-addons: make fcitx5-lua addon optional
Signed-off-by: ercao <vip@ercao.cn>
This commit is contained in:
parent
6a2a15948b
commit
6ea6e3ca29
1 changed files with 3 additions and 3 deletions
|
@ -1,11 +1,11 @@
|
||||||
{ lib, symlinkJoin, makeWrapper, fcitx5, fcitx5-lua, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [ ] }:
|
{ lib, symlinkJoin, makeWrapper, fcitx5, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [ ] }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
symlinkJoin {
|
symlinkJoin {
|
||||||
name = "fcitx5-with-addons-${fcitx5.version}";
|
name = "fcitx5-with-addons-${fcitx5.version}";
|
||||||
|
|
||||||
paths = [ fcitx5 fcitx5-configtool fcitx5-qt fcitx5-lua fcitx5-gtk ] ++ addons;
|
paths = [ fcitx5 fcitx5-configtool fcitx5-qt fcitx5-gtk ] ++ addons;
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ symlinkJoin {
|
||||||
--prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \
|
--prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \
|
||||||
--suffix XDG_DATA_DIRS : "$out/share" \
|
--suffix XDG_DATA_DIRS : "$out/share" \
|
||||||
--suffix PATH : "$out/bin" \
|
--suffix PATH : "$out/bin" \
|
||||||
--suffix LD_LIBRARY_PATH : ${makeLibraryPath fcitx5-lua.extraLdLibraries};
|
--suffix LD_LIBRARY_PATH : ${makeLibraryPath (flatten (map (x: x.extraLdLibraries or []) addons))}
|
||||||
|
|
||||||
desktop=share/applications/org.fcitx.Fcitx5.desktop
|
desktop=share/applications/org.fcitx.Fcitx5.desktop
|
||||||
autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop
|
autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop
|
||||||
|
|
Loading…
Reference in a new issue