diff options
| author | Matthieu Coudron <teto@users.noreply.github.com> | 2022-12-11 16:29:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-11 16:29:50 +0100 |
| commit | 1e4904867791cf84434c81722f73f5b8fef81de3 (patch) | |
| tree | 850a26049e9bc8bdf9dfe6da233b7315ed1a4081 | |
| parent | Merge pull request #205605 from fabaff/home-assistant-bluetooth-bump (diff) | |
| parent | fcitx5-with-addons: make fcitx5-lua addon optional (diff) | |
| download | nixpkgs-1e4904867791cf84434c81722f73f5b8fef81de3.tar.gz | |
Merge pull request #204642 from ercao/fix-fcitx5-lua-addon
fcitx5-with-addons: fix not found liblua.so
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix | 22 | ||||
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx5/with-addons.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 16 insertions, 17 deletions
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 4f76a1e770a7..7da946b0518c 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -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 lua gettext ]; - buildInputs = [ - fcitx5 - luaPackage - gettext - ]; + passthru = { + extraLdLibraries = [ lua ]; + }; meta = with lib; { description = "Lua support for Fcitx 5"; diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix index 020e829f0987..68d2f0612ca1 100644 --- a/pkgs/tools/inputmethods/fcitx5/with-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix @@ -1,9 +1,11 @@ -{ symlinkJoin, makeWrapper, fcitx5, fcitx5-lua, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [] }: +{ lib, symlinkJoin, makeWrapper, fcitx5, 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-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 (flatten (map (x: x.extraLdLibraries or []) addons))} desktop=share/applications/org.fcitx.Fcitx5.desktop autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40657456749a..b8cd5ce1a4ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6987,7 +6987,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 { }; |