Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

nixos/waydroid: allow override waydroid

wxt ee0937ff 6f7fdf8e

+4 -4
+4 -4
nixos/modules/virtualisation/waydroid.nix
··· 8 let 9 cfg = config.virtualisation.waydroid; 10 kCfg = config.lib.kernelConfig; 11 - kernelPackages = config.boot.kernelPackages; 12 waydroidGbinderConf = pkgs.writeText "waydroid.conf" '' 13 [Protocol] 14 /dev/binder = aidl2 ··· 26 27 options.virtualisation.waydroid = { 28 enable = lib.mkEnableOption "Waydroid"; 29 }; 30 31 config = lib.mkIf cfg.enable { ··· 49 50 environment.etc."gbinder.d/waydroid.conf".source = waydroidGbinderConf; 51 52 - environment.systemPackages = with pkgs; [ waydroid ]; 53 54 networking.firewall.trustedInterfaces = [ "waydroid0" ]; 55 ··· 63 serviceConfig = { 64 Type = "dbus"; 65 UMask = "0022"; 66 - ExecStart = "${pkgs.waydroid}/bin/waydroid -w container start"; 67 BusName = "id.waydro.Container"; 68 }; 69 }; ··· 72 "d /var/lib/misc 0755 root root -" # for dnsmasq.leases 73 ]; 74 75 - services.dbus.packages = with pkgs; [ waydroid ]; 76 }; 77 78 }
··· 8 let 9 cfg = config.virtualisation.waydroid; 10 kCfg = config.lib.kernelConfig; 11 waydroidGbinderConf = pkgs.writeText "waydroid.conf" '' 12 [Protocol] 13 /dev/binder = aidl2 ··· 25 26 options.virtualisation.waydroid = { 27 enable = lib.mkEnableOption "Waydroid"; 28 + package = lib.mkPackageOption pkgs "waydroid" { }; 29 }; 30 31 config = lib.mkIf cfg.enable { ··· 49 50 environment.etc."gbinder.d/waydroid.conf".source = waydroidGbinderConf; 51 52 + environment.systemPackages = [ cfg.package ]; 53 54 networking.firewall.trustedInterfaces = [ "waydroid0" ]; 55 ··· 63 serviceConfig = { 64 Type = "dbus"; 65 UMask = "0022"; 66 + ExecStart = "${cfg.package}/bin/waydroid -w container start"; 67 BusName = "id.waydro.Container"; 68 }; 69 }; ··· 72 "d /var/lib/misc 0755 root root -" # for dnsmasq.leases 73 ]; 74 75 + services.dbus.packages = [ cfg.package ]; 76 }; 77 78 }