cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fcitx5-with-addons: fix not found liblua.so

Browse source 
Signed-off-by: ercao <vip@ercao.cn>
This commit is contained in:
ercao 2022-12-08 10:55:40 +08:00
parent 6e51c97f1c
commit 6a2a15948b
No known key found for this signature in database
GPG key ID: FFABD1257ECF0889
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
View file

@ -1,13 +1,12 @@
{ lib, stdenv { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, extra-cmake-modules , extra-cmake-modules
, fcitx5 , fcitx5
, lua5_3 , lua
, luaPackage ? lua5_3
, gettext , gettext
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fcitx5-lua"; pname = "fcitx5-lua";
version = "5.0.10"; version = "5.0.10";
@ -19,16 +18,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-0ESgQv8kyc+zv/tDZtBZ+QhFFswD80ApwswFlJs8tOU="; sha256 = "sha256-0ESgQv8kyc+zv/tDZtBZ+QhFFswD80ApwswFlJs8tOU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [ cmake extra-cmake-modules ];
cmake
extra-cmake-modules
];
buildInputs = [ buildInputs = [ fcitx5 lua gettext ];
fcitx5
luaPackage passthru = {
gettext extraLdLibraries = [ lua ];
]; };
meta = with lib; { meta = with lib; {
description = "Lua support for Fcitx 5"; description = "Lua support for Fcitx 5";

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

@ -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 { symlinkJoin {
name = "fcitx5-with-addons-${fcitx5.version}"; 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 ]; nativeBuildInputs = [ makeWrapper ];
@ -11,7 +13,8 @@ symlinkJoin {
wrapProgram $out/bin/fcitx5 \ wrapProgram $out/bin/fcitx5 \
--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};
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

2
pkgs/top-level/all-packages.nix
View file

@ -6979,7 +6979,7 @@ with pkgs;
fcitx5-chewing = callPackage ../tools/inputmethods/fcitx5/fcitx5-chewing.nix { }; 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 { }; fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { };