Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7539f489b481
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 337b3f902287
Choose a head ref
  • 5 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 19, 2021

  1. fcitx5-qt: fix missing libfcitx5platforminputcontextplugin.so

    @berberman
    berberman committed Jan 19, 2021
    Copy the full SHA
    9509da4 View commit details

  2. fcitx5-with-addons: patch .desktop files

    @berberman
    berberman committed Jan 19, 2021
    Copy the full SHA
    61615cc View commit details

  3. fcitx5-with-addons: symlink .desktop to autostart 

    Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
    @berberman @SuperSandro2000
    berberman and SuperSandro2000 committed Jan 19, 2021
    Copy the full SHA
    9e58c85 View commit details

  4. fcitx5-with-addons: remove unnecessary qtbase from buildInputs

    @berberman
    berberman committed Jan 19, 2021
    Copy the full SHA
    a612380 View commit details

  5. Merge pull request #109649 from berberman/fix-fcitx5

    @SuperSandro2000
    SuperSandro2000 authored Jan 19, 2021
    Copy the full SHA
    337b3f9 View commit details
Showing with 15 additions and 0 deletions.
  1. +7 −0 pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
  2. +8 −0 pkgs/tools/inputmethods/fcitx5/with-addons.nix
7 changes: 7 additions & 0 deletions pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
, qtx11extras
, libxcb
, libXdmcp
, qtbase
}:

mkDerivation rec {
@@ -20,8 +21,14 @@ mkDerivation rec {
sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM=";
};

preConfigure = ''
substituteInPlace qt5/platforminputcontext/CMakeLists.txt \
--replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix}
'';

cmakeFlags = [
"-DENABLE_QT4=0"
"-DENABLE_QT6=0"
];

nativeBuildInputs = [
8 changes: 8 additions & 0 deletions pkgs/tools/inputmethods/fcitx5/with-addons.nix
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,14 @@ symlinkJoin {
--prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \
--suffix XDG_DATA_DIRS : "$out/share" \
--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;