public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #109649 from berberman/fix-fcitx5

Browse Source
This commit is contained in:
Sandro 2021-01-19 18:34:43 +01:00 committed by GitHub
commit 337b3f9022
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
View File

@ -7,6 +7,7 @@
, qtx11extras , qtx11extras
, libxcb , libxcb
, libXdmcp , libXdmcp
, qtbase
}: }:
mkDerivation rec { mkDerivation rec {
@ -20,8 +21,14 @@ mkDerivation rec {
sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM="; sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM=";
}; };
preConfigure = ''
substituteInPlace qt5/platforminputcontext/CMakeLists.txt \
--replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix}
'';
cmakeFlags = [ cmakeFlags = [
"-DENABLE_QT4=0" "-DENABLE_QT4=0"
"-DENABLE_QT6=0"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

8
pkgs/tools/inputmethods/fcitx5/with-addons.nix
View File

@ -12,6 +12,14 @@ symlinkJoin {
--prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \ --prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \
--suffix XDG_DATA_DIRS : "$out/share" \ --suffix XDG_DATA_DIRS : "$out/share" \
--suffix PATH : "$out/bin" --suffix PATH : "$out/bin"
desktop=share/applications/org.fcitx.Fcitx5.desktop
autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop
rm $out/$desktop
rm $out/$autostart
cp ${fcitx5}/$desktop $out/$desktop
sed -i $out/$desktop -e "s|^Exec=.*|Exec=$out/bin/fcitx5|g"
ln -s $out/$desktop $out/$autostart
''; '';
meta = fcitx5.meta; meta = fcitx5.meta;