fcitx5-with-addons: fix not found liblua.so
Signed-off-by: ercao <vip@ercao.cn>
This commit is contained in:
parent
6e51c97f1c
commit
6a2a15948b
|
@ -1,13 +1,12 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, fcitx5
|
||||
, lua5_3
|
||||
, luaPackage ? lua5_3
|
||||
, lua
|
||||
, gettext
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-lua";
|
||||
version = "5.0.10";
|
||||
|
@ -19,16 +18,13 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-0ESgQv8kyc+zv/tDZtBZ+QhFFswD80ApwswFlJs8tOU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
];
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
||||
buildInputs = [
|
||||
fcitx5
|
||||
luaPackage
|
||||
gettext
|
||||
];
|
||||
buildInputs = [ fcitx5 lua gettext ];
|
||||
|
||||
passthru = {
|
||||
extraLdLibraries = [ lua ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lua support for Fcitx 5";
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
{ symlinkJoin, makeWrapper, fcitx5, fcitx5-lua, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [] }:
|
||||
{ lib, symlinkJoin, makeWrapper, fcitx5, fcitx5-lua, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [ ] }:
|
||||
|
||||
with lib;
|
||||
|
||||
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-lua fcitx5-gtk ] ++ addons;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
@ -11,7 +13,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 : ${makeLibraryPath fcitx5-lua.extraLdLibraries};
|
||||
|
||||
desktop=share/applications/org.fcitx.Fcitx5.desktop
|
||||
autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop
|
||||
|
|
|
@ -6979,7 +6979,7 @@ with pkgs;
|
|||
|
||||
fcitx5-chewing = callPackage ../tools/inputmethods/fcitx5/fcitx5-chewing.nix { };
|
||||
|
||||
fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { };
|
||||
fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { lua = lua5_3; };
|
||||
|
||||
fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue