colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

linux-megous: simplify the Kconfig further

Browse Source
This commit is contained in:
Colin
2024-05-20 18:08:42 +00:00
parent 6eb75b3841
commit a47102e152
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/additional/linux-megous/default.nix
View File

@@ -65,22 +65,23 @@ let
MODEM_POWER = lib.mkIf (!withModemPower) no; MODEM_POWER = lib.mkIf (!withModemPower) no;
# normally a module; try inline? for vibration/haptics # normally a module; try inline? for vibration/haptics
INPUT_GPIO_VIBRA = yes; # INPUT_GPIO_VIBRA = yes;
INPUT_PWM_VIBRA = yes; # INPUT_PWM_VIBRA = yes;
PWM_SUN4I = yes; # PWM_SUN4I = yes;
# DRM_SUN4I = yes; # DRM_SUN* defaults to module. # DRM_SUN4I = yes; # DRM_SUN* defaults to module.
# DRM_SUN8I_MIXER = yes; # DRM_SUN8I_MIXER = yes;
# DRM_SUN6I_DSI = yes; # DRM_SUN6I_DSI = yes;
# taken from mobile-nixos config?? or upstream megous config?? # taken from mobile-nixos config?? or upstream megous config??
RTL8723CS = module; RTL8723CS = module;
BT_HCIUART_3WIRE = yes; # BT_HCIUART_3WIRE = yes;
BT_HCIUART_RTL = yes; # BT_HCIUART_RTL = yes;
RTL8XXXU_UNTESTED = yes; # RTL8XXXU_UNTESTED = yes;
BT_BNEP_MC_FILTER = yes; # BT_BNEP_MC_FILTER = yes;
BT_BNEP_PROTO_FILTER = yes; # BT_BNEP_PROTO_FILTER = yes;
BT_HS = yes; # BT_HS = yes;
BT_LE = yes; # BT_LE = yes;
# #
### BUILD FIXES, NOT SPECIFIC TO MY PREFERENCES ### BUILD FIXES, NOT SPECIFIC TO MY PREFERENCES
# #
@@ -289,13 +290,7 @@ in buildLinux (args // {
inherit rev hash; inherit rev hash;
}; };
kernelPatches = extraKernelPatches ++ ( kernelPatches = (args.kernelPatches or []) ++ extraKernelPatches;
# this patch only applies to nixpkgs kernel (and is probably not necessary on megi's).
# TODO: remove the patch and this logic here once fixed in nixpkgs: <https://github.com/NixOS/nixpkgs/issues/255803>
lib.filter
(p: p.name != "backport-nfs4-selinux-fix")
(args.kernelPatches or [])
);
structuredExtraConfig = (args.structuredExtraConfig or {}) // kernelConfig; structuredExtraConfig = (args.structuredExtraConfig or {}) // kernelConfig;
}) })