From eb5dfc7b48568f87b76bec23369333ffdf9f6efc Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 11 Apr 2026 10:02:14 -0500
Subject: [PATCH 1/2] openbangla-keyboard: migrate to by-name, preserve
 overrides

---
 .../op}/openbangla-keyboard/Cargo.lock               |  0
 .../op/openbangla-keyboard/package.nix}              | 12 +++++++-----
 pkgs/top-level/all-packages.nix                      |  4 ----
 3 files changed, 7 insertions(+), 9 deletions(-)
 rename pkgs/{applications/misc => by-name/op}/openbangla-keyboard/Cargo.lock (100%)
 rename pkgs/{applications/misc/openbangla-keyboard/default.nix => by-name/op/openbangla-keyboard/package.nix} (92%)

diff --git a/pkgs/applications/misc/openbangla-keyboard/Cargo.lock b/pkgs/by-name/op/openbangla-keyboard/Cargo.lock
similarity index 100%
rename from pkgs/applications/misc/openbangla-keyboard/Cargo.lock
rename to pkgs/by-name/op/openbangla-keyboard/Cargo.lock
diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/by-name/op/openbangla-keyboard/package.nix
similarity index 92%
rename from pkgs/applications/misc/openbangla-keyboard/default.nix
rename to pkgs/by-name/op/openbangla-keyboard/package.nix
index 005345179886..167fc76cc8b7 100644
--- a/pkgs/applications/misc/openbangla-keyboard/default.nix
+++ b/pkgs/by-name/op/openbangla-keyboard/package.nix
@@ -7,19 +7,21 @@
   pkg-config,
   rustPlatform,
   rustc,
-  wrapQtAppsHook,
   fcitx5,
   ibus,
-  qtbase,
+  libsForQt5,
   zstd,
   withFcitx5Support ? false,
-  withIbusSupport ? false,
+  withIbusSupport ? true,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openbangla-keyboard";
   version = "2.0.0-unstable-2025-08-19";
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   src = fetchFromGitHub {
     owner = "openbangla";
     repo = "openbangla-keyboard";
@@ -34,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     cargo
     rustc
     rustPlatform.cargoSetupHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs =
@@ -45,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       ibus
     ]
     ++ [
-      qtbase
+      libsForQt5.qtbase
       zstd
     ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a09c77b2e54..9ede1bc817d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2042,10 +2042,6 @@ with pkgs;
     mozc = mozc.override { withIbus = true; };
     mozc-ut = mozc-ut.override { withIbus = true; };
 
-    openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard {
-      withIbusSupport = true;
-    };
-
     pinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-pinyin { };
 
     rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { };

From 6c2d1cec330b1d944a60026f84361eb056c8122c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 11 Apr 2026 10:04:15 -0500
Subject: [PATCH 2/2] fcitx5-openbangla-keyboard: migrate to by-name, preserve
 overrides

---
 .../fc/fcitx5-openbangla-keyboard/package.nix        | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                      |  4 ----
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/fc/fcitx5-openbangla-keyboard/package.nix

diff --git a/pkgs/by-name/fc/fcitx5-openbangla-keyboard/package.nix b/pkgs/by-name/fc/fcitx5-openbangla-keyboard/package.nix
new file mode 100644
index 000000000000..3d479e7a6518
--- /dev/null
+++ b/pkgs/by-name/fc/fcitx5-openbangla-keyboard/package.nix
@@ -0,0 +1,12 @@
+{
+  openbangla-keyboard,
+  ...
+}@args:
+
+openbangla-keyboard.override (
+  {
+    withFcitx5Support = true;
+    withIbusSupport = false;
+  }
+  // removeAttrs args [ "openbangla-keyboard" ]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ede1bc817d2..6975a2323ccf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2272,10 +2272,6 @@ with pkgs;
 
   fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { };
 
-  fcitx5-openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard {
-    withFcitx5Support = true;
-  };
-
   fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { };
 
   fcitx5-hangul = callPackage ../tools/inputmethods/fcitx5/fcitx5-hangul.nix { };