diff options
| author | adisbladis <adisbladis@gmail.com> | 2022-04-02 22:52:37 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-02 22:52:37 +1200 |
| commit | f206f262a4451e71ed8615520ec2b5fbb9e86c02 (patch) | |
| tree | 92f0c42f59bda41285604883800cb61f9d663d57 | |
| parent | 75e301c3577776d76bc9287ba3f57b2657c403f0 (diff) | |
| parent | 8b7daabf5bbc44d7f99db5a137983c954b47d326 (diff) | |
| download | nixlib-f206f262a4451e71ed8615520ec2b5fbb9e86c02.tar nixlib-f206f262a4451e71ed8615520ec2b5fbb9e86c02.tar.gz nixlib-f206f262a4451e71ed8615520ec2b5fbb9e86c02.tar.bz2 nixlib-f206f262a4451e71ed8615520ec2b5fbb9e86c02.tar.lz nixlib-f206f262a4451e71ed8615520ec2b5fbb9e86c02.tar.xz nixlib-f206f262a4451e71ed8615520ec2b5fbb9e86c02.tar.zst nixlib-f206f262a4451e71ed8615520ec2b5fbb9e86c02.zip | |
Merge pull request #166914 from taku0/mozc_emacs_helper
mozc: make mozc.el to find mozc_emacs_helper
| -rw-r--r-- | pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 18c8549b9cca..7c481c6d977e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -547,6 +547,13 @@ let ''; }); }); + + mozc = super.mozc.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace src/unix/emacs/mozc.el \ + --replace '"mozc_emacs_helper"' '"${pkgs.ibus-engines.mozc}/lib/mozc/mozc_emacs_helper"' + ''; + }); }; in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super); diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 049e369e296e..8d4a93a375ec 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation rec { install -m 644 data/images/unix/ui-alpha_half.png $out/share/ibus-mozc/alpha_half.png install -m 644 data/images/unix/ui-alpha_full.png $out/share/ibus-mozc/alpha_full.png install -D -m 755 out_linux/Release/mozc_renderer $out/lib/mozc/mozc_renderer + install -D -m 755 out_linux/Release/mozc_emacs_helper $out/lib/mozc/mozc_emacs_helper runHook postInstall ''; |