From 8813b5a191418cdb4abebf07f8ad681858310fdd Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Mon, 1 Mar 2021 21:52:38 +0100 Subject: fcitx: wrap with xmodmap in PATH fcitx contains functionality to execute xmodmap when changing the layout, which triggers if ~/.Xmodmap is present. However, this breaks if xmodmap isn't present in fcitx's PATH. --- pkgs/tools/inputmethods/fcitx/unwrapped.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/inputmethods/fcitx') diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 35683101918..e9d7f0765b7 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -2,7 +2,7 @@ , libxml2, enchant2, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , dbus, gtk2, gtk3, qt4, extra-cmake-modules -, xkeyboard_config, pcre, libuuid +, xkeyboard_config, pcre, libuuid, xorg, makeWrapper , withPinyin ? true , fetchFromGitLab }: @@ -68,7 +68,12 @@ stdenv.mkDerivation rec { patchShebangs cmake/ ''; - nativeBuildInputs = [ cmake extra-cmake-modules intltool pkg-config pcre ]; + postInstall = '' + wrapProgram $out/bin/fcitx \ + --prefix PATH : "${xorg.xmodmap}/bin" + ''; + + nativeBuildInputs = [ cmake extra-cmake-modules intltool pkg-config pcre makeWrapper ]; buildInputs = [ xkeyboard_config enchant2 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile -- cgit 1.4.1