From 6b5d311cb66a153bffbdf96d5e9b79f1c3656a2e Mon Sep 17 00:00:00 2001
From: damianoognissanti <97738787+damianoognissanti@users.noreply.github.com>
Date: Tue, 16 Jan 2024 18:28:45 +0100
Subject: [PATCH 1/2] Fix patches.nix

As discussed here: https://github.com/NixOS/nixos-hardware/issues/523

1) `structuredExtraConfig` is called `extraStructuredConfig` when using `kernelPatches`

2) STREAMING_MEDIA should be STAGING_MEDIA
---
 microsoft/surface/common/kernel/linux-6.6.x/patches.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/microsoft/surface/common/kernel/linux-6.6.x/patches.nix b/microsoft/surface/common/kernel/linux-6.6.x/patches.nix
index 40264ad..4d3b947 100644
--- a/microsoft/surface/common/kernel/linux-6.6.x/patches.nix
+++ b/microsoft/surface/common/kernel/linux-6.6.x/patches.nix
@@ -7,8 +7,8 @@
   {
     name = "microsoft-surface-patches-linux-${version}";
     patch = null;
-    structuredExtraConfig = with kernel; {
-      STREAMING_MEDIA = yes;
+    extraStructuredConfig = with kernel; {
+      STAGING_MEDIA = yes;
 
       #
       # Surface Aggregator Module

From e57f8c264a4b6c2c8fef65dcd1adc13237004901 Mon Sep 17 00:00:00 2001
From: damianoognissanti <97738787+damianoognissanti@users.noreply.github.com>
Date: Tue, 16 Jan 2024 18:41:29 +0100
Subject: [PATCH 2/2] Update default.nix

Needed to make kernel build if options from patch are missing.
---
 microsoft/surface/common/kernel/linux-6.6.x/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/microsoft/surface/common/kernel/linux-6.6.x/default.nix b/microsoft/surface/common/kernel/linux-6.6.x/default.nix
index eaa796d..abbc0d2 100644
--- a/microsoft/surface/common/kernel/linux-6.6.x/default.nix
+++ b/microsoft/surface/common/kernel/linux-6.6.x/default.nix
@@ -23,6 +23,7 @@ let
       url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
       sha256 = "sha256-nuYn5MEJrsf8o+2liY6B0gGvLH6y99nX2UwfDhIFVGw=";
     };
+    ignoreConfigErrors=true;
   };