From ee0937ff0db78d87f57165c89038c0f1dfd22fa4 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 22 Jun 2025 08:02:37 +0800
Subject: [PATCH 1/2] nixos/waydroid: allow override waydroid

---
 nixos/modules/virtualisation/waydroid.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/waydroid.nix b/nixos/modules/virtualisation/waydroid.nix
index f9891023291c..a26bddc393ae 100644
--- a/nixos/modules/virtualisation/waydroid.nix
+++ b/nixos/modules/virtualisation/waydroid.nix
@@ -8,7 +8,6 @@
 let
   cfg = config.virtualisation.waydroid;
   kCfg = config.lib.kernelConfig;
-  kernelPackages = config.boot.kernelPackages;
   waydroidGbinderConf = pkgs.writeText "waydroid.conf" ''
     [Protocol]
     /dev/binder = aidl2
@@ -26,6 +25,7 @@ in
 
   options.virtualisation.waydroid = {
     enable = lib.mkEnableOption "Waydroid";
+    package = lib.mkPackageOption pkgs "waydroid" { };
   };
 
   config = lib.mkIf cfg.enable {
@@ -49,7 +49,7 @@ in
 
     environment.etc."gbinder.d/waydroid.conf".source = waydroidGbinderConf;
 
-    environment.systemPackages = with pkgs; [ waydroid ];
+    environment.systemPackages = [ cfg.package ];
 
     networking.firewall.trustedInterfaces = [ "waydroid0" ];
 
@@ -63,7 +63,7 @@ in
       serviceConfig = {
         Type = "dbus";
         UMask = "0022";
-        ExecStart = "${pkgs.waydroid}/bin/waydroid -w container start";
+        ExecStart = "${cfg.package}/bin/waydroid -w container start";
         BusName = "id.waydro.Container";
       };
     };
@@ -72,7 +72,7 @@ in
       "d /var/lib/misc 0755 root root -" # for dnsmasq.leases
     ];
 
-    services.dbus.packages = with pkgs; [ waydroid ];
+    services.dbus.packages = [ cfg.package ];
   };
 
 }

From e1d83e3cee69a59ed9b9df80d1441bb607b24f91 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 22 Jun 2025 08:02:45 +0800
Subject: [PATCH 2/2] waydroid: adopt

---
 pkgs/by-name/wa/waydroid/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index c4c6128770e7..446c15d1bf83 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -108,6 +108,6 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/waydroid/waydroid";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
   };
 }