nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-24.05] nixos/ipu6: Don't build out-of-tree driver for kernels that have it (#332240)

Browse Source
This commit is contained in:
Shea Levy 2024-09-01 06:33:05 -04:00 committed by GitHub
commit fbbd9323de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/hardware/video/webcam/ipu6.nix
View File

@ -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

5
pkgs/top-level/linux-kernels.nix
View File

@ -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 {};