From 5ca9ff267f515db8dc57ea1756841b08f82c13b6 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 30 May 2026 12:44:01 -0400
Subject: [PATCH] {ibus,ibus-with-plugins}: move to by-name

(cherry picked from commit 6c14796461a9069142fd55be6b2e2800bf9c8c5a)
---
 .../wrapper.nix => by-name/ib/ibus-with-plugins/package.nix}  | 0
 .../ib}/ibus/build-without-dbus-launch.patch                  | 0
 pkgs/{tools/inputmethods => by-name/ib}/ibus/fix-paths.patch  | 0
 .../ibus/default.nix => by-name/ib/ibus/package.nix}          | 0
 .../inputmethods => by-name/ib}/ibus/vala-parallelism.patch   | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 6 files changed, 4 deletions(-)
 rename pkgs/{tools/inputmethods/ibus/wrapper.nix => by-name/ib/ibus-with-plugins/package.nix} (100%)
 rename pkgs/{tools/inputmethods => by-name/ib}/ibus/build-without-dbus-launch.patch (100%)
 rename pkgs/{tools/inputmethods => by-name/ib}/ibus/fix-paths.patch (100%)
 rename pkgs/{tools/inputmethods/ibus/default.nix => by-name/ib/ibus/package.nix} (100%)
 rename pkgs/{tools/inputmethods => by-name/ib}/ibus/vala-parallelism.patch (100%)

diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/by-name/ib/ibus-with-plugins/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/ibus/wrapper.nix
rename to pkgs/by-name/ib/ibus-with-plugins/package.nix
diff --git a/pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch b/pkgs/by-name/ib/ibus/build-without-dbus-launch.patch
similarity index 100%
rename from pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch
rename to pkgs/by-name/ib/ibus/build-without-dbus-launch.patch
diff --git a/pkgs/tools/inputmethods/ibus/fix-paths.patch b/pkgs/by-name/ib/ibus/fix-paths.patch
similarity index 100%
rename from pkgs/tools/inputmethods/ibus/fix-paths.patch
rename to pkgs/by-name/ib/ibus/fix-paths.patch
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/by-name/ib/ibus/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/ibus/default.nix
rename to pkgs/by-name/ib/ibus/package.nix
diff --git a/pkgs/tools/inputmethods/ibus/vala-parallelism.patch b/pkgs/by-name/ib/ibus/vala-parallelism.patch
similarity index 100%
rename from pkgs/tools/inputmethods/ibus/vala-parallelism.patch
rename to pkgs/by-name/ib/ibus/vala-parallelism.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f28f828bce33..d5f15bdd1dd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1955,8 +1955,6 @@ with pkgs;
 
   skkDictionaries = recurseIntoAttrs (callPackages ../tools/inputmethods/skk/skk-dicts { });
 
-  ibus = callPackage ../tools/inputmethods/ibus { };
-
   ibus-engines = recurseIntoAttrs {
     anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { };
 
@@ -2000,8 +1998,6 @@ with pkgs;
     };
   };
 
-  ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { };
-
   interception-tools = callPackage ../tools/inputmethods/interception-tools { };
   interception-tools-plugins = recurseIntoAttrs {
     caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { };