Jamie McClymont <jamie@kwiius.com> writes:

> The ANALOGIX_ANX7625 option no longer exists, but  VIDEO_INTEL_IPU6 is
> now a source of build errors.
> ---
>  pkgs/os-specific/linux/kernel/linux-cros.nix | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/pkgs/os-specific/linux/kernel/linux-cros.nix b/pkgs/os-specific/linux/kernel/linux-cros.nix
> index 789a9fb6fd2..d292fe2c54a 100644
> --- a/pkgs/os-specific/linux/kernel/linux-cros.nix
> +++ b/pkgs/os-specific/linux/kernel/linux-cros.nix
> @@ -29,6 +29,10 @@ buildLinux (args // rec {
>      # Enabling this (the default) caused a build failure.  If you can
>      # archieve a successful build with this enabled, go ahead and
>      # enable it.
> -    ANALOGIX_ANX7625 = no;
> +    VIDEO_INTEL_IPU6 = no;
> +
> +    # RTW88_8822*E were being selected as Y when N/m/? are the only valid options
> +    RTW88_8822BE = lib.mkForce no;
> +    RTW88_8822CE = lib.mkForce no;

What do you think about setting these to "modules" instead of "no"?
It looks like that's what we do in Nixpkgs for more recent kernels that
behave the same way (not allowing Y).

>    } // (args.structuredExtraConfig or {});
>  } // (args.argsOverride or {}))
> -- 
> 2.31.1

Patch LGTM other than that.