Unverified Commit 3252ebb1 authored by figsoda's avatar figsoda Committed by GitHub
Browse files

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

fcitx5: remove global with
parents 9a32d74c f6919f62

pkgs/tools/inputmethods/fcitx5/with-addons.nix

+2 −4
Original line number Diff line number Diff line 
{ 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;

}