From 4de84265d7ec7634a69ba75028696d74de9a44a7 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 2 Mar 2024 21:52:18 +0100 Subject: [PATCH] fcitx5: fix tests --- tests/modules/i18n/input-method/fcitx5-stubs.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/modules/i18n/input-method/fcitx5-stubs.nix b/tests/modules/i18n/input-method/fcitx5-stubs.nix index 2a981125..f63f9cc1 100644 --- a/tests/modules/i18n/input-method/fcitx5-stubs.nix +++ b/tests/modules/i18n/input-method/fcitx5-stubs.nix @@ -15,7 +15,6 @@ }; fcitx5-configtool = { outPath = null; }; fcitx5-lua = { outPath = null; }; - fcitx5-qt = { outPath = null; }; fcitx5-gtk = { outPath = null; }; fcitx5-chinese-addons = { outPath = null; }; @@ -36,9 +35,18 @@ }; nixpkgs.overlays = [ - (self: super: { - fcitx5-with-addons = - super.fcitx5-with-addons.override { inherit (self) fcitx5-qt; }; + (final: super: { + libsForQt5 = super.libsForQt5.overrideScope' (qt5prev: qt5final: { + fcitx5-qt = super.mkStubPackage { outPath = null; }; + }); + + qt6Packages = super.qt6Packages.overrideScope' (qt6prev: qt6final: { + fcitx5-qt = super.mkStubPackage { outPath = null; }; + }); + + fcitx5-with-addons = super.fcitx5-with-addons.override { + inherit (final) libsForQt5 qt6Packages; + }; }) ]; }