diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-05-03 09:35:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-03 09:35:04 +0200 |
commit | e76dd5230fc8d55476cda26d97aad887c10f2ee5 (patch) | |
tree | 8e809009bae2f1b2a3762756888e77fd6c9278b5 | |
parent | 86a6908045c6a6c613e6a94b447c95846408fde3 (diff) | |
parent | 2474c8c89a3af7c88a653fc040056d600414307b (diff) |
Merge pull request #167032 from Vonfry/feature/fcitx5/rime/with-custom-data-dirs
fcitx5-rime: support custom data dir from environment variable for nixos and nix specially
-rw-r--r-- | nixos/modules/i18n/input-method/fcitx5.nix | 27 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-rime-with-nix-env-variable.patch | 18 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix | 2 |
3 files changed, 41 insertions, 6 deletions
diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix index 6fea28e22345..b4b887606e95 100644 --- a/nixos/modules/i18n/input-method/fcitx5.nix +++ b/nixos/modules/i18n/input-method/fcitx5.nix @@ -5,7 +5,9 @@ with lib; let im = config.i18n.inputMethod; cfg = im.fcitx5; - fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; }; + addons = cfg.addons ++ optional cfg.enableRimeData pkgs.rime-data; + fcitx5Package = pkgs.fcitx5-with-addons.override { inherit addons; }; + whetherRimeDataDir = any (p: p.pname == "fcitx5-rime") cfg.addons; in { options = { i18n.inputMethod.fcitx5 = { @@ -17,16 +19,29 @@ in { Enabled Fcitx5 addons. ''; }; + + enableRimeData = mkEnableOption "default rime-data with fcitx5-rime"; }; }; config = mkIf (im.enabled == "fcitx5") { i18n.inputMethod.package = fcitx5Package; - environment.variables = { - GTK_IM_MODULE = "fcitx"; - QT_IM_MODULE = "fcitx"; - XMODIFIERS = "@im=fcitx"; - }; + environment = mkMerge [{ + variables = { + GTK_IM_MODULE = "fcitx"; + QT_IM_MODULE = "fcitx"; + XMODIFIERS = "@im=fcitx"; + }; + } + (mkIf whetherRimeDataDir { + pathsToLink = [ + "/share/rime-data" + ]; + + variables = { + NIX_RIME_DATA_DIR = "/run/current-system/sw/share/rime-data"; + }; + })]; }; } diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime-with-nix-env-variable.patch b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime-with-nix-env-variable.patch new file mode 100644 index 000000000000..428a0232dc3b --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime-with-nix-env-variable.patch @@ -0,0 +1,18 @@ +:100644 100644 fac4f53 aed9617 M src/rimeengine.cpp + +diff --git a/src/rimeengine.cpp b/src/rimeengine.cpp +index fac4f53..aed9617 100644 +--- a/src/rimeengine.cpp ++++ b/src/rimeengine.cpp +@@ -164,7 +164,10 @@ void RimeEngine::rimeStart(bool fullcheck) { + RIME_ERROR() << "Failed to create user directory: " << userDir; + } + } +- const char *sharedDataDir = RIME_DATA_DIR; ++ const char *sharedDataDir = getenv("NIX_RIME_DATA_DIR"); ++ if (!sharedDataDir) { ++ sharedDataDir = RIME_DATA_DIR; ++ } + + RIME_STRUCT(RimeTraits, fcitx_rime_traits); + fcitx_rime_traits.shared_data_dir = sharedDataDir; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 3743d6cb9fc8..fac81c8dea12 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { librime ]; + patches = [ ./fcitx5-rime-with-nix-env-variable.patch ]; + meta = with lib; { description = "RIME support for Fcitx5"; homepage = "https://github.com/fcitx/fcitx5-rime"; |