diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2021-03-01 21:52:38 +0100 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2021-03-01 21:52:38 +0100 |
| commit | 8813b5a191418cdb4abebf07f8ad681858310fdd (patch) | |
| tree | 01be8dac26ac201be076d365c46a3ef879cc94af /pkgs/tools/inputmethods/fcitx | |
| parent | f3322d79fb748aaabf8273584b2d387ede9ab509 (diff) | |
| download | nixpkgs-8813b5a191418cdb4abebf07f8ad681858310fdd.tar nixpkgs-8813b5a191418cdb4abebf07f8ad681858310fdd.tar.gz nixpkgs-8813b5a191418cdb4abebf07f8ad681858310fdd.tar.bz2 nixpkgs-8813b5a191418cdb4abebf07f8ad681858310fdd.tar.lz nixpkgs-8813b5a191418cdb4abebf07f8ad681858310fdd.tar.xz nixpkgs-8813b5a191418cdb4abebf07f8ad681858310fdd.tar.zst nixpkgs-8813b5a191418cdb4abebf07f8ad681858310fdd.zip | |
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.
Diffstat (limited to 'pkgs/tools/inputmethods/fcitx')
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx/unwrapped.nix | 9 |
1 files changed, 7 insertions, 2 deletions
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 |