Merge pull request #147365 from FlorianFranzen/waydroid/psi-default

This commit is contained in:
Maciej Krüger 2021-12-03 14:58:31 +01:00 committed by GitHub
commit 79f6a3147f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -18,7 +18,8 @@ let
/dev/hwbinder = hidl
'';
in {
in
{
options.virtualisation.waydroid = {
enable = mkEnableOption "Waydroid";
@ -36,6 +37,12 @@ in {
(isEnabled "ASHMEM")
];
/* NOTE: we always enable this flag even if CONFIG_PSI_DEFAULT_DISABLED is not on
as reading the kernel config is not always possible and on kernels where it's
already on it will be no-op
*/
boot.kernelParams = [ "psi=1" ];
environment.etc."gbinder.d/waydroid.conf".source = waydroidGbinderConf;
environment.systemPackages = with pkgs; [ waydroid ];