tobias/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-11-09 16:18:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

nixos/waydroid: use waydroid-nftables by default if nftables is enabled

Browse source
This commit is contained in:
éclairevoyant 2025-10-24 19:36:13 -04:00
parent 1fec77ff03
commit 098c4d08d7
No known key found for this signature in database
GPG key ID: E3813AEAA02DB54B
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2511.section.md
View file

@ -305,6 +305,8 @@ and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).
- `vmalert` now supports multiple instances with the option `services.vmalert.instances."".enable`
- [`virtualisation.waydroid.package`](#opt-virtualisation.waydroid.package) now defaults to `waydroid-nftables` on systems with nftables enabled.
- [`services.victorialogs.package`](#opt-services.victorialogs.package) now defaults to `victorialogs`, as `victoriametrics` no longer contains the VictoriaLogs binaries.
- The `services.traccar.settings` attribute has been reworked. Instead of the previous flat attribute set the new implementation uses nested attribute sets. You need to update you configuration manually. For instance, `services.traccar.settings.loggerConsole` becomes `services.traccar.settings.logger.console`.

5
nixos/modules/virtualisation/waydroid.nix
View file

@ -25,7 +25,10 @@ in
options.virtualisation.waydroid = {
enable = lib.mkEnableOption "Waydroid";
package = lib.mkPackageOption pkgs "waydroid" { };
package = lib.mkPackageOption pkgs "waydroid" { } // {
default = if config.networking.nftables.enable then pkgs.waydroid-nftables else pkgs.waydroid;
defaultText = lib.literalExpression ''if config.networking.nftables.enable then pkgs.waydroid-nftables else pkgs.waydroid'';
};
};
config = lib.mkIf cfg.enable {