From 25f2fea5202045295bcb84f8e8417f805f42bba6 Mon Sep 17 00:00:00 2001
From: goatastronaut0212 <goatastronaut0212@proton.me>
Date: Tue, 21 May 2024 10:57:19 +0700
Subject: [PATCH 1/4] maintainers: add astronaut0212

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index dad1f76ab7c3..3c95e103d0d5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1876,6 +1876,12 @@
       fingerprint = "BF47 81E1 F304 1ADF 18CE  C401 DE16 C7D1 536D A72F";
     }];
   };
+  astronaut0212 = {
+    email = "goatastronaut0212@proton.me";
+    github = "goatastronaut0212";
+    githubId = 119769817;
+    name = "goatastronaut0212";
+  };
   astsmtl = {
     email = "astsmtl@yandex.ru";
     github = "astsmtl";

From 024669c7371793ee6cd1767dce084a9b44b64d05 Mon Sep 17 00:00:00 2001
From: goatastronaut0212 <goatastronaut0212@proton.me>
Date: Tue, 21 May 2024 12:34:54 +0700
Subject: [PATCH 2/4] ibus-engines.bamboo: 0.8.2-rc18 -> 0.8.4-rc3

---
 .../inputmethods/ibus-engines/ibus-bamboo/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
index 286539174a95..04dbfb64ff96 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ibus-bamboo";
-  version = "0.8.2-rc18";
+  version = "0.8.4-rc3";
 
   src = fetchFromGitHub {
     owner = "BambooEngine";
     repo = pname;
     rev = "v" + lib.toUpper version;
-    sha256 = "sha256-5FSGPUJtUdYyeqJenvKaMIJcvon91I//62fnTCXcdig=";
+    sha256 = "sha256-P09gXuxbD4RJcXvgnRyFgSxt6NEXfpXJDPzl50ZtAxM=";
   };
 
   nativeBuildInputs = [
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     export GOCACHE="$TMPDIR/go-cache"
-    sed -i "s,/usr,$out," bamboo.xml
+    sed -i "s,/usr,$out," data/bamboo.xml
   '';
 
   makeFlags = [
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/BambooEngine/ibus-bamboo";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ superbo ];
+    maintainers = with maintainers; [ astronaut0212 superbo ];
   };
 }

From 50be40524b38e05afb12441f8ffbf74a023b8367 Mon Sep 17 00:00:00 2001
From: goatastronaut0212 <goatastronaut0212@proton.me>
Date: Thu, 23 May 2024 07:40:18 +0700
Subject: [PATCH 3/4] ibus-engines.bamboo: remove superbo as maintainer

---
 maintainers/maintainer-list.nix                             | 6 ------
 .../tools/inputmethods/ibus-engines/ibus-bamboo/default.nix | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3c95e103d0d5..c912c0694d6a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19683,12 +19683,6 @@
     githubId = 36031171;
     name = "Supa";
   };
-  superbo = {
-    email = "supernbo@gmail.com";
-    github = "SuperBo";
-    githubId = 2666479;
-    name = "Y Nguyen";
-  };
   superherointj = {
     email = "sergiomarcelo@yandex.com";
     github = "superherointj";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
index 04dbfb64ff96..8a6e69905d43 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/BambooEngine/ibus-bamboo";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ astronaut0212 superbo ];
+    maintainers = with maintainers; [ astronaut0212 ];
   };
 }

From 6536fbb145502acbc97939f0fd0e63976570f724 Mon Sep 17 00:00:00 2001
From: goatastronaut0212 <goatastronaut0212@proton.me>
Date: Thu, 23 May 2024 17:35:43 +0700
Subject: [PATCH 4/4] ibus-engines.bamboo: clean up code

---
 .../inputmethods/ibus-engines/ibus-bamboo/default.nix    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
index 8a6e69905d43..f28b636c47eb 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
@@ -1,11 +1,8 @@
 { lib, stdenv
 , fetchFromGitHub
-, glib
-, gettext
 , xorg
 , pkg-config
 , wrapGAppsHook3
-, gtk3
 , go
 }:
 
@@ -21,19 +18,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gettext
     pkg-config
     wrapGAppsHook3
     go
   ];
 
   buildInputs = [
-    glib
-    gtk3
-    xorg.libX11
-    xorg.xorgproto
     xorg.libXtst
-    xorg.libXi
   ];
 
   preConfigure = ''