diff options
| author | Shea Levy <shea@shealevy.com> | 2024-09-01 06:33:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-01 06:33:05 -0400 |
| commit | fbbd9323de977111da69ab055d7fdb374e952aec (patch) | |
| tree | 36ac35d284ef74fb532081ca1890997bf2956dc0 | |
| parent | [Backport release-24.05] stats: 2.11.4 -> 2.11.7 (#338612) (diff) | |
| parent | ipu6: Don't build out-of-tree driver for kernels that have it (diff) | |
| download | nixpkgs-fbbd9323de977111da69ab055d7fdb374e952aec.tar.gz | |
[Backport release-24.05] nixos/ipu6: Don't build out-of-tree driver for kernels that have it (#332240)
| -rw-r--r-- | nixos/modules/hardware/video/webcam/ipu6.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/nixos/modules/hardware/video/webcam/ipu6.nix b/nixos/modules/hardware/video/webcam/ipu6.nix index de47fe3f6b5a..ae54e24ee2da 100644 --- 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 index a596da13643e..a606a7886aca 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -356,7 +356,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 {}; |