Merge remote-tracking branch 'shlevy/ipu6-upstream'

NixOS · Aug 4, 2024 · a9f862f · a9f862f
2 parents c297203 + 3bfeae1
commit a9f862f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/nixos/modules/hardware/video/webcam/ipu6.nix b/nixos/modules/hardware/video/webcam/ipu6.nix
@@ -26,9 +26,9 @@ in
 
   config = mkIf cfg.enable {
 
-    boot.extraModulePackages = with config.boot.kernelPackages; [
-      ipu6-drivers
-    ];
+    # Module is upstream as of 6.10
+    boot.extraModulePackages = with config.boot.kernelPackages;
+      optional (kernelOlder "6.10") ipu6-drivers;
 
     hardware.firmware = with pkgs; [
       ipu6-camera-bins

diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
@@ -377,7 +377,10 @@ in {
 
     intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null;
 
-    ipu6-drivers = callPackage ../os-specific/linux/ipu6-drivers {};
+    ipu6-drivers =
+      if kernelOlder "6.10"
+      then callPackage ../os-specific/linux/ipu6-drivers {}
+      else null;
 
     ivsc-driver = callPackage ../os-specific/linux/ivsc-driver {};