From b6d31e127daa9b0e71d346283fae0082625eb826 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 21 May 2024 21:45:31 +0000 Subject: [PATCH] linux-megous: dont auto-enable SELINUX i think maybe it's disabled for a reason: systemd is built without it, and either it or SUN8I_DE2_CCU seems to be the difference between working drm and non-working drm --- pkgs/additional/linux-megous/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/additional/linux-megous/default.nix b/pkgs/additional/linux-megous/default.nix index e5a6dd40..33e477be 100644 --- a/pkgs/additional/linux-megous/default.nix +++ b/pkgs/additional/linux-megous/default.nix @@ -185,15 +185,15 @@ let # options needed if `withNixpkgsConfig` is enabled... even if `withFullConfig` is as well nixpkgsFixes = with lib.kernel; { - SUN8I_DE2_CCU = lib.mkForce module; #< nixos' default `Y` confuses its own config parser + SUN8I_DE2_CCU = lib.mkForce yes; #< nixos' default `Y` confuses its own config parser #v XXX: required for e.g. SECURITY_LANDLOCK (specified by upstream nixpkgs) to take effect if `autoModules = false` #v seems that upstream linux (the defconfigs?), it defaults to Yes for: # - arch/x86/configs/x86_64_defconfig # - arch/arm64/configs/defconfig # but that it's left unset for e.g. arch/arm64/configs/pinephone_defconfig. TODO: upstream to nixpkgs SECURITY = yes; - SECURITY_SELINUX = yes; #< not sure if actually required; it would usually be enabled by autoModules - SECURITY_SELINUX_BOOTPARAM = yes; + # SECURITY_SELINUX = yes; #< not sure if actually required; it would usually be enabled by autoModules + # SECURITY_SELINUX_BOOTPARAM = yes; # PCI needed because of the dependency on module `ahci` # like SECURITY, it's present for the default x86, arm64 defconfigs, but not the flavored ones. PCI = yes;