From 0aa66218edf20f8d4a249b1e2495514248d10992 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Wed, 31 Jul 2024 14:46:09 +0800
Subject: [PATCH] overlays: tighter scope

---
 overlays/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/overlays/default.nix b/overlays/default.nix
index a4ff93a..347b3fb 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -22,15 +22,20 @@ in {
     };
 
     # HACK: no more qt5
-    libsForQt5 = prev.libsForQt5.overrideScope (_qt5final: _qt5prev: {
-      fcitx5-qt = prev.emptyDirectory;
+    qt6Packages = prev.qt6Packages.overrideScope (_qt6final: qt6prev: {
+      fcitx5-with-addons = qt6prev.fcitx5-with-addons.override {
+        libsForQt5.fcitx5-qt = prev.emptyDirectory;
+      };
     });
 
     # HACK: no more gtk2
-    gtk2 = prev.emptyDirectory;
-    gnome-themes-extra = prev.gnome-themes-extra.overrideAttrs {
-      configureFlags = ["--disable-gtk2-engine"];
-    };
+    gnome-themes-extra =
+      (prev.gnome-themes-extra.override {
+        gtk2 = prev.emptyDirectory;
+      })
+      .overrideAttrs {
+        configureFlags = ["--disable-gtk2-engine"];
+      };
 
     sway-unwrapped = addPatches prev.sway-unwrapped [
       # text_input: Implement input-method popups