From b5870597f9476b2813bd267b5ea50b7c9af8600c Mon Sep 17 00:00:00 2001
From: Stzx <silence.m@hotmail.com>
Date: Sun, 30 Nov 2025 16:47:07 +0800
Subject: [PATCH 1/3] python3Packages.gbinder-python: 1.1.2 -> 1.3.0

---
 .../python-modules/gbinder-python/default.nix       | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix
index d63c86c78f6d..9ede6d2c28fa 100644
--- a/pkgs/development/python-modules/gbinder-python/default.nix
+++ b/pkgs/development/python-modules/gbinder-python/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "gbinder-python";
-  version = "1.1.2";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "erfanoabdi";
+    owner = "waydroid";
     repo = "gbinder-python";
     tag = version;
-    hash = "sha256-up1EDuR05a7TlCErd2BXkp01oqi6hEskt7xVxsJqquM=";
+    hash = "sha256-z0hMAvwB+uttPcP+in+C3o1ujhFSiDXKktOajnsXhPI=";
   };
 
   build-system = [
@@ -34,14 +34,13 @@ buildPythonPackage rec {
   postPatch = ''
     # Fix pkg-config name for cross-compilation
     substituteInPlace setup.py \
-      --replace-fail "pkg-config" "$PKG_CONFIG" \
-      --replace-fail "USE_CYTHON = False" "USE_CYTHON = True"
+      --replace-fail "pkg-config" "$PKG_CONFIG"
   '';
 
   meta = {
     description = "Python bindings for libgbinder";
-    homepage = "https://github.com/erfanoabdi/gbinder-python";
-    license = lib.licenses.gpl3;
+    homepage = "https://github.com/waydroid/gbinder-python";
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = [ ];
   };

From 31a124fd7227ba0399e3be2ec27d69332ba35ef8 Mon Sep 17 00:00:00 2001
From: Stzx <silence.m@hotmail.com>
Date: Sun, 30 Nov 2025 16:47:57 +0800
Subject: [PATCH 2/3] waydroid: 1.5.4 -> 1.6.1

---
 pkgs/by-name/wa/waydroid/package.nix | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index 4d6920f37407..8be28b6cc1ad 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitHub,
-  fetchpatch,
   python3Packages,
   dnsmasq,
   gawk,
@@ -23,24 +22,16 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "waydroid";
-  version = "1.5.4";
+  version = "1.6.1";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "waydroid";
     repo = "waydroid";
     tag = version;
-    hash = "sha256-K4uJ9MVmr5+7O1em1yUJXZj6H8bpfm2ZAE2uqgiyDBQ=";
+    hash = "sha256-2ywAgWYMQ7N2P4x/0maNUSn3pdaRAWyATaraRAGafxI=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/waydroid/waydroid/commit/af296c90a788dde0b33813b12607cfab2fa65b98.patch";
-      hash = "sha256-1vkEKk00dbBLbbBxZIhcoOYUP976SJlaWyzYSWBy0nU=";
-      revert = true;
-    })
-  ];
-
   nativeBuildInputs = [
     gobject-introspection
     wrapGAppsHook3
@@ -63,14 +54,11 @@ python3Packages.buildPythonApplication rec {
   dontWrapGApps = true;
 
   installFlags = [
-    "PREFIX=$(out)"
+    "PREFIX=${placeholder "out"}"
     "USE_SYSTEMD=0"
-    "SYSCONFDIR=$(out)/etc"
-  ];
-  postInstall = lib.optionalString withNftables ''
-    substituteInPlace $out/lib/waydroid/data/scripts/waydroid-net.sh \
-      --replace-fail 'LXC_USE_NFT="false"' 'LXC_USE_NFT="true"'
-  '';
+    "SYSCONFDIR=${placeholder "out"}/etc"
+  ]
+  ++ lib.optional withNftables "USE_NFTABLES=1";
 
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
@@ -102,8 +90,8 @@ python3Packages.buildPythonApplication rec {
       )
     }"
 
-    substituteInPlace $out/lib/waydroid/tools/helpers/*.py \
-      --replace '"sh"' '"${runtimeShell}"'
+    substituteInPlace $out/lib/waydroid/tools/helpers/run.py $out/lib/waydroid/tools/helpers/lxc.py \
+      --replace-fail '"sh"' '"${runtimeShell}"'
   '';
 
   passthru.updateScript = nix-update-script { };

From a19b01531940ea34a761c0f79f22856043e1e0da Mon Sep 17 00:00:00 2001
From: Stzx <silence.m@hotmail.com>
Date: Sun, 30 Nov 2025 16:48:23 +0800
Subject: [PATCH 3/3] nixos/waydroid: fix systemd service

---
 nixos/modules/virtualisation/waydroid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/waydroid.nix b/nixos/modules/virtualisation/waydroid.nix
index 706ee115ba8c..27c1e27083c8 100644
--- a/nixos/modules/virtualisation/waydroid.nix
+++ b/nixos/modules/virtualisation/waydroid.nix
@@ -66,7 +66,7 @@ in
       serviceConfig = {
         Type = "dbus";
         UMask = "0022";
-        ExecStart = "${cfg.package}/bin/waydroid -w container start";
+        ExecStart = "${cfg.package}/bin/waydroid container start";
         BusName = "id.waydro.Container";
       };
     };