nixos/waydroid: allow override waydroid

wxt ee0937ff 6f7fdf8e

Changed files
+4 -4
nixos
modules
virtualisation
+4 -4
nixos/modules/virtualisation/waydroid.nix
···
let
cfg = config.virtualisation.waydroid;
kCfg = config.lib.kernelConfig;
-
kernelPackages = config.boot.kernelPackages;
waydroidGbinderConf = pkgs.writeText "waydroid.conf" ''
[Protocol]
/dev/binder = aidl2
···
options.virtualisation.waydroid = {
enable = lib.mkEnableOption "Waydroid";
};
config = lib.mkIf cfg.enable {
···
environment.etc."gbinder.d/waydroid.conf".source = waydroidGbinderConf;
-
environment.systemPackages = with pkgs; [ waydroid ];
networking.firewall.trustedInterfaces = [ "waydroid0" ];
···
serviceConfig = {
Type = "dbus";
UMask = "0022";
-
ExecStart = "${pkgs.waydroid}/bin/waydroid -w container start";
BusName = "id.waydro.Container";
};
};
···
"d /var/lib/misc 0755 root root -" # for dnsmasq.leases
];
-
services.dbus.packages = with pkgs; [ waydroid ];
};
}
···
let
cfg = config.virtualisation.waydroid;
kCfg = config.lib.kernelConfig;
waydroidGbinderConf = pkgs.writeText "waydroid.conf" ''
[Protocol]
/dev/binder = aidl2
···
options.virtualisation.waydroid = {
enable = lib.mkEnableOption "Waydroid";
+
package = lib.mkPackageOption pkgs "waydroid" { };
};
config = lib.mkIf cfg.enable {
···
environment.etc."gbinder.d/waydroid.conf".source = waydroidGbinderConf;
+
environment.systemPackages = [ cfg.package ];
networking.firewall.trustedInterfaces = [ "waydroid0" ];
···
serviceConfig = {
Type = "dbus";
UMask = "0022";
+
ExecStart = "${cfg.package}/bin/waydroid -w container start";
BusName = "id.waydro.Container";
};
};
···
"d /var/lib/misc 0755 root root -" # for dnsmasq.leases
];
+
services.dbus.packages = [ cfg.package ];
};
}