From bdea159ffab9865f808b8d92fd2bef33521867b2 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 5 Mar 2024 22:53:10 +0100
Subject: [PATCH] fcitx5: fix reference to fcitx5-with-addons

---
 modules/i18n/input-method/fcitx5.nix          |  3 ++-
 .../i18n/input-method/fcitx5-stubs.nix        | 21 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/i18n/input-method/fcitx5.nix b/modules/i18n/input-method/fcitx5.nix
index 3599fd2dc..3c2d1c191 100644
--- a/modules/i18n/input-method/fcitx5.nix
+++ b/modules/i18n/input-method/fcitx5.nix
@@ -5,7 +5,8 @@ with lib;
 let
   im = config.i18n.inputMethod;
   cfg = im.fcitx5;
-  fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; };
+  fcitx5Package =
+    pkgs.libsForQt5.fcitx5-with-addons.override { inherit (cfg) addons; };
 in {
   options = {
     i18n.inputMethod.fcitx5 = {
diff --git a/tests/modules/i18n/input-method/fcitx5-stubs.nix b/tests/modules/i18n/input-method/fcitx5-stubs.nix
index f63f9cc1c..2390ddde8 100644
--- a/tests/modules/i18n/input-method/fcitx5-stubs.nix
+++ b/tests/modules/i18n/input-method/fcitx5-stubs.nix
@@ -13,10 +13,8 @@
                  $out/bin/fcitx5-config-qt
       '';
     };
-    fcitx5-configtool = { outPath = null; };
     fcitx5-lua = { outPath = null; };
     fcitx5-gtk = { outPath = null; };
-    fcitx5-chinese-addons = { outPath = null; };
 
     gtk2 = {
       buildScript = ''
@@ -35,18 +33,21 @@
   };
 
   nixpkgs.overlays = [
-    (final: super: {
-      libsForQt5 = super.libsForQt5.overrideScope' (qt5prev: qt5final: {
-        fcitx5-qt = super.mkStubPackage { outPath = null; };
+    (final: prev: {
+      libsForQt5 = prev.libsForQt5.overrideScope (qt5final: qt5prev: {
+        fcitx5-chinese-addons = prev.mkStubPackage { outPath = null; };
+        fcitx5-configtool = prev.mkStubPackage { outPath = null; };
+        fcitx5-qt = prev.mkStubPackage { outPath = null; };
+
+        fcitx5-with-addons = qt5prev.fcitx5-with-addons.override {
+          inherit (final) libsForQt5 qt6Packages;
+        };
       });
 
-      qt6Packages = super.qt6Packages.overrideScope' (qt6prev: qt6final: {
-        fcitx5-qt = super.mkStubPackage { outPath = null; };
+      qt6Packages = prev.qt6Packages.overrideScope (qt6final: qt6prev: {
+        fcitx5-qt = prev.mkStubPackage { outPath = null; };
       });
 
-      fcitx5-with-addons = super.fcitx5-with-addons.override {
-        inherit (final) libsForQt5 qt6Packages;
-      };
     })
   ];
 }