From 3c9892d4d4a1049071629a269e0c7ce7a0eb0a4b Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 10 Feb 2016 11:41:51 +0900
Subject: [PATCH] ibus: group engines

---
 .../{ => ibus-engines}/ibus-anthy/default.nix |  0
 .../ibus-mozc}/default.nix                    |  0
 .../ibus-table-others/default.nix             |  0
 .../{ => ibus-engines}/ibus-table/default.nix |  0
 .../{ibus-qt/default.nix => ibus/ibus-qt.nix} |  0
 pkgs/top-level/all-packages.nix               | 20 +++++++++++--------
 6 files changed, 12 insertions(+), 8 deletions(-)
 rename pkgs/tools/inputmethods/{ => ibus-engines}/ibus-anthy/default.nix (100%)
 rename pkgs/tools/inputmethods/{mozc => ibus-engines/ibus-mozc}/default.nix (100%)
 rename pkgs/tools/inputmethods/{ => ibus-engines}/ibus-table-others/default.nix (100%)
 rename pkgs/tools/inputmethods/{ => ibus-engines}/ibus-table/default.nix (100%)
 rename pkgs/tools/inputmethods/{ibus-qt/default.nix => ibus/ibus-qt.nix} (100%)

diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
similarity index 100%
rename from pkgs/tools/inputmethods/ibus-anthy/default.nix
rename to pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
diff --git a/pkgs/tools/inputmethods/mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
similarity index 100%
rename from pkgs/tools/inputmethods/mozc/default.nix
rename to pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
similarity index 100%
rename from pkgs/tools/inputmethods/ibus-table-others/default.nix
rename to pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
similarity index 100%
rename from pkgs/tools/inputmethods/ibus-table/default.nix
rename to pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-qt/default.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix
similarity index 100%
rename from pkgs/tools/inputmethods/ibus-qt/default.nix
rename to pkgs/tools/inputmethods/ibus/ibus-qt.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2e26707c45..f6eac612375 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1170,19 +1170,23 @@ let
 
   m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };
 
-  mozc = callPackage ../tools/inputmethods/mozc {
-    inherit (pythonPackages) gyp;
-  };
-
   ibus = callPackage ../tools/inputmethods/ibus { };
 
-  ibus-qt = callPackage ../tools/inputmethods/ibus-qt { };
+  ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
 
-  ibus-anthy = callPackage ../tools/inputmethods/ibus-anthy { };
+  ibus-engines = {
 
-  ibus-table = callPackage ../tools/inputmethods/ibus-table { };
+    anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { };
 
-  ibus-table-others = callPackage ../tools/inputmethods/ibus-table-others { };
+    mozc = callPackage ../tools/inputmethods/ibus-engines/mozc {
+      inherit (pythonPackages) gyp;
+    };
+
+    table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { };
+
+    table-others = callPackage ../tools/inputmethods/ibus-engines/ibus-table-others { };
+
+  };
 
   brotli = callPackage ../tools/compression/brotli { };