Unverified Commit 098c4d08 authored by éclairevoyant's avatar éclairevoyant
Browse files

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

parent 1fec77ff

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

+2 −0
Original line number Diff line number Diff line
@@ -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`.

nixos/modules/virtualisation/waydroid.nix

+4 −1
Original line number Diff line number Diff line
@@ -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 {