patches and low-level development discussion
 help / color / mirror / code / Atom feed
From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Cc: Jamie McClymont <jamie@kwiius.com>
Subject: [PATCH nixpkgs v2 2/8] chromiumOSPackages.linux: fix config
Date: Sat, 29 May 2021 14:41:11 +0000	[thread overview]
Message-ID: <20210529144117.571353-3-hi@alyssa.is> (raw)
In-Reply-To: <20210529144117.571353-1-hi@alyssa.is>

From: Jamie McClymont <jamie@kwiius.com>

Co-authored-by: Alyssa Ross <hi@alyssa.is>
Reviewed-by: Alyssa Ross <hi@alyssa.is>
Tested-by: Alyssa Ross <hi@alyssa.is>
---
 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..edaa33ac0fb 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 module;
+    RTW88_8822CE = lib.mkForce module;
   } // (args.structuredExtraConfig or {});
 } // (args.argsOverride or {}))
-- 
2.31.1


  parent reply	other threads:[~2021-05-29 14:42 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-29 14:41 [PATCH nixpkgs v2 0/8] chromiumOSPackages: 83.13020.0.0-rc1 -> 89.13729.0.0-rc1 Alyssa Ross
2021-05-29 14:41 ` [PATCH nixpkgs v2 1/8] " Alyssa Ross
2021-05-29 14:41 ` Alyssa Ross [this message]
2021-05-29 14:41 ` [PATCH nixpkgs v2 3/8] chromiumOSPackages.common-mk: update patches Alyssa Ross
2021-05-29 14:41 ` [PATCH nixpkgs v2 4/8] chromiumOSPackages.vm_protos: drop GN patch Alyssa Ross
2021-05-29 14:41 ` [PATCH nixpkgs v2 5/8] chromiumOSPackages.common-mk: disable clang-only warnings Alyssa Ross
2021-05-29 14:41 ` [PATCH nixpkgs v2 6/8] chromiumOSPackages.sommelier: update patches Alyssa Ross
2021-05-29 14:41 ` [PATCH nixpkgs v2 7/8] crosvm: fix build Alyssa Ross
2021-05-29 14:41 ` [PATCH nixpkgs v2 8/8] spectrumPackages.linux: drop evged patch Alyssa Ross
2021-06-02 12:30 ` [PATCH nixpkgs v2 0/8] chromiumOSPackages: 83.13020.0.0-rc1 -> 89.13729.0.0-rc1 Alyssa Ross

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210529144117.571353-3-hi@alyssa.is \
    --to=hi@alyssa.is \
    --cc=devel@spectrum-os.org \
    --cc=jamie@kwiius.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://spectrum-os.org/git/crosvm
	https://spectrum-os.org/git/doc
	https://spectrum-os.org/git/mktuntap
	https://spectrum-os.org/git/nixpkgs
	https://spectrum-os.org/git/spectrum
	https://spectrum-os.org/git/ucspi-vsock
	https://spectrum-os.org/git/www

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).