about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDennis Gosnell <cdep.illabout@gmail.com>2019-11-13 17:07:06 +0900
committerGitHub <noreply@github.com>2019-11-13 17:07:06 +0900
commit3ac9f1ecced3f3ecc89ffa23c8f8d8f257012178 (patch)
treecccf2524b5bb0146718d1843744e5beb126127dc
parent3823edaee48acd8f8913cb5246dbe9d8e4a39223 (diff)
parent05c94e3acda49e206bde32ec28df5ed57872c4cb (diff)
downloadnixlib-3ac9f1ecced3f3ecc89ffa23c8f8d8f257012178.tar
nixlib-3ac9f1ecced3f3ecc89ffa23c8f8d8f257012178.tar.gz
nixlib-3ac9f1ecced3f3ecc89ffa23c8f8d8f257012178.tar.bz2
nixlib-3ac9f1ecced3f3ecc89ffa23c8f8d8f257012178.tar.lz
nixlib-3ac9f1ecced3f3ecc89ffa23c8f8d8f257012178.tar.xz
nixlib-3ac9f1ecced3f3ecc89ffa23c8f8d8f257012178.tar.zst
nixlib-3ac9f1ecced3f3ecc89ffa23c8f8d8f257012178.zip
Merge pull request #73272 from oxalica/fcitx-configtool-path-fix
fcitx-configtool: patch paths to fcitx-remote
-rw-r--r--pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
index e10ffae4a51e..ae9d8d0f53f6 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper fcitx cmake isocodes gtk3
     gnome3.adwaita-icon-theme ];
 
+  # Patch paths to `fcitx-remote`
+  prePatch = ''
+    for f in gtk{3,}/config_widget.c; do
+      substituteInPlace $f \
+        --replace 'EXEC_PREFIX "/bin/fcitx-remote"' '"${fcitx}/bin/fcitx-remote"'
+    done
+  '';
+
   preFixup = ''
     wrapProgram $out/bin/fcitx-config-gtk3 \
       --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS";