BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #205762 from SuperSandro2000/fcitx5-no-with-lib

Browse source 
fcitx5: remove global with
This commit is contained in:
figsoda 2022-12-12 09:02:02 -05:00 committed by GitHub
commit 3252ebb11a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/inputmethods/fcitx5/with-addons.nix
View file

@ -1,7 +1,5 @@
{ lib, symlinkJoin, makeWrapper, fcitx5, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [ ] }:
with lib;
symlinkJoin {
name = "fcitx5-with-addons-${fcitx5.version}";
@ -14,7 +12,7 @@ symlinkJoin {
--prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \
--suffix XDG_DATA_DIRS : "$out/share" \
--suffix PATH : "$out/bin" \
--suffix LD_LIBRARY_PATH : ${makeLibraryPath (flatten (map (x: x.extraLdLibraries or []) addons))}
--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
@ -25,5 +23,5 @@ symlinkJoin {
ln -s $out/$desktop $out/$autostart
'';
meta = fcitx5.meta;
inherit (fcitx5) meta;
}