diff --git a/pkgs/additional/linux-megous/default.nix b/pkgs/additional/linux-megous/default.nix index 7852f2f1..98a63bb7 100644 --- a/pkgs/additional/linux-megous/default.nix +++ b/pkgs/additional/linux-megous/default.nix @@ -65,22 +65,23 @@ let MODEM_POWER = lib.mkIf (!withModemPower) no; # normally a module; try inline? for vibration/haptics - INPUT_GPIO_VIBRA = yes; - INPUT_PWM_VIBRA = yes; - PWM_SUN4I = yes; + # INPUT_GPIO_VIBRA = yes; + # INPUT_PWM_VIBRA = yes; + # PWM_SUN4I = yes; + # DRM_SUN4I = yes; # DRM_SUN* defaults to module. # DRM_SUN8I_MIXER = yes; # DRM_SUN6I_DSI = yes; # taken from mobile-nixos config?? or upstream megous config?? RTL8723CS = module; - BT_HCIUART_3WIRE = yes; - BT_HCIUART_RTL = yes; - RTL8XXXU_UNTESTED = yes; - BT_BNEP_MC_FILTER = yes; - BT_BNEP_PROTO_FILTER = yes; - BT_HS = yes; - BT_LE = yes; + # BT_HCIUART_3WIRE = yes; + # BT_HCIUART_RTL = yes; + # RTL8XXXU_UNTESTED = yes; + # BT_BNEP_MC_FILTER = yes; + # BT_BNEP_PROTO_FILTER = yes; + # BT_HS = yes; + # BT_LE = yes; # ### BUILD FIXES, NOT SPECIFIC TO MY PREFERENCES # @@ -289,13 +290,7 @@ in buildLinux (args // { inherit rev hash; }; - kernelPatches = 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: - lib.filter - (p: p.name != "backport-nfs4-selinux-fix") - (args.kernelPatches or []) - ); + kernelPatches = (args.kernelPatches or []) ++ extraKernelPatches; structuredExtraConfig = (args.structuredExtraConfig or {}) // kernelConfig; })