diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/inputmethods/fcitx5/with-addons.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/inputmethods/fcitx5/with-addons.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/with-addons.nix index 020e829f0987..d2d1e2f992ae 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/with-addons.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/with-addons.nix @@ -1,9 +1,9 @@ -{ symlinkJoin, makeWrapper, fcitx5, fcitx5-lua, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [] }: +{ lib, symlinkJoin, makeWrapper, fcitx5, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [ ] }: symlinkJoin { name = "fcitx5-with-addons-${fcitx5.version}"; - paths = [ fcitx5 fcitx5-configtool fcitx5-lua fcitx5-qt fcitx5-gtk ] ++ addons; + paths = [ fcitx5 fcitx5-configtool fcitx5-qt fcitx5-gtk ] ++ addons; nativeBuildInputs = [ makeWrapper ]; @@ -11,7 +11,8 @@ symlinkJoin { wrapProgram $out/bin/fcitx5 \ --prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \ --suffix XDG_DATA_DIRS : "$out/share" \ - --suffix PATH : "$out/bin" + --suffix PATH : "$out/bin" \ + --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath (lib.flatten (map (x: x.extraLdLibraries or []) addons))} desktop=share/applications/org.fcitx.Fcitx5.desktop autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop @@ -22,5 +23,5 @@ symlinkJoin { ln -s $out/$desktop $out/$autostart ''; - meta = fcitx5.meta; + inherit (fcitx5) meta; } |