Merge pull request #114782 from NieDzejkob/fcitx-xmodmap

fcitx: wrap with xmodmap in PATH
This commit is contained in:
Sandro 2021-03-02 17:10:11 +01:00 committed by GitHub
commit 0bd1d10ea5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,7 +2,7 @@
, libxml2, enchant2, isocodes, icu, libpthreadstubs , libxml2, enchant2, isocodes, icu, libpthreadstubs
, pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
, dbus, gtk2, gtk3, qt4, extra-cmake-modules , dbus, gtk2, gtk3, qt4, extra-cmake-modules
, xkeyboard_config, pcre, libuuid , xkeyboard_config, pcre, libuuid, xorg, makeWrapper
, withPinyin ? true , withPinyin ? true
, fetchFromGitLab , fetchFromGitLab
}: }:
@ -68,7 +68,12 @@ stdenv.mkDerivation rec {
patchShebangs cmake/ 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 = [ buildInputs = [
xkeyboard_config enchant2 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile xkeyboard_config enchant2 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile