From 800af4240b3ef56509dec2ca6cc55f578701bed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihai-Drosi=20C=C3=A2ju?= Date: Sun, 24 Sep 2023 17:46:51 +0300 Subject: [PATCH] nixos/waydroid: Replace requirement for ASHMEM with MEMFD_CREATE * fixes #250302 * ASHMEM was removed in Linux 5.18 and waydroid can use MEMFD instead. MEMFD is enabled by default in 4.18 and later kernels while we already require this version for namespace support. --- nixos/modules/virtualisation/waydroid.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/waydroid.nix b/nixos/modules/virtualisation/waydroid.nix index b0e85b685083..1f466c780cf2 100644 --- a/nixos/modules/virtualisation/waydroid.nix +++ b/nixos/modules/virtualisation/waydroid.nix @@ -32,7 +32,7 @@ in system.requiredKernelConfig = [ (kCfg.isEnabled "ANDROID_BINDER_IPC") (kCfg.isEnabled "ANDROID_BINDERFS") - (kCfg.isEnabled "ASHMEM") # FIXME Needs memfd support instead on Linux 5.18 and waydroid 1.2.1 + (kCfg.isEnabled "MEMFD_CREATE") ]; /* NOTE: we always enable this flag even if CONFIG_PSI_DEFAULT_DISABLED is not on