diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-14 18:01:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-14 18:01:11 +0000 |
| commit | 6cc772a6fa213f2624f490735f4cf49426bcc0e0 (patch) | |
| tree | 398d8785581708be3eb823fcffdc18b0f8726e65 /pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | |
| parent | 0523b2e6c2ea7730352fa32e8a921ec331569571 (diff) | |
| parent | cd014bdb858891bc7a3f0c1267ef8ad4fd11f19c (diff) | |
| download | nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.tar nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.tar.gz nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.tar.bz2 nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.tar.lz nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.tar.xz nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.tar.zst nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix')
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index e922bc533c2c..a532a447a1ef 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -9,17 +9,18 @@ , libXdmcp , qtbase , qt6 +, wayland }: mkDerivation rec { pname = "fcitx5-qt"; - version = "5.1.1"; + version = "5.1.3"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-IkaaLFMyPVaL5taRN4e+QxMEsNhhXlA1fWBn/6PeGnI="; + sha256 = "sha256-qXQ5nvPV5YHD8MFfeqgF8kyk0zf28lWxM8SUo3T6TzA="; }; preConfigure = '' @@ -31,7 +32,7 @@ mkDerivation rec { cmakeFlags = [ # adding qt6 to buildInputs would result in error: detected mismatched Qt dependencies - "-DCMAKE_PREFIX_PATH=${qt6.qtbase}" + "-DCMAKE_PREFIX_PATH=${qt6.qtbase};${qt6.qtwayland}" "-DENABLE_QT4=0" "-DENABLE_QT6=1" ]; @@ -46,6 +47,7 @@ mkDerivation rec { qtx11extras libxcb libXdmcp + wayland ]; meta = with lib; { |