From 828686b4041ffc47f2df4925ecb19501bb9aac14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 24 Oct 2025 10:46:58 -0400 Subject: [PATCH] waydroid: add nftables support --- pkgs/by-name/wa/waydroid/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix index 7c69c637fe9c..4d6920f37407 100644 --- a/pkgs/by-name/wa/waydroid/package.nix +++ b/pkgs/by-name/wa/waydroid/package.nix @@ -12,11 +12,13 @@ lxc, iproute2, iptables, + nftables, util-linux, wrapGAppsHook3, wl-clipboard, runtimeShell, nix-update-script, + withNftables ? false, }: python3Packages.buildPythonApplication rec { @@ -65,6 +67,10 @@ python3Packages.buildPythonApplication rec { "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"' + ''; preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") @@ -76,7 +82,7 @@ python3Packages.buildPythonApplication rec { dnsmasq getent iproute2 - iptables + (if withNftables then nftables else iptables) ] }