Merge pull request #175895 from MatthiasBenaets/new-lg4ff

nixos/new-lg4ff: fix kernel selection

nixos/modules/hardware/new-lg4ff.nix

···
 
 let
   cfg = config.hardware.new-lg4ff;
+  kernelPackages = config.boot.kernelPackages;
 in {
   options.hardware.new-lg4ff = {
     enable = mkOption {
···
 
   config = lib.mkIf cfg.enable {
     boot = {
-      extraModulePackages = [ pkgs.new-lg4ff ];
+      extraModulePackages = [ kernelPackages.new-lg4ff ];
       kernelModules = [ "hid-logitech-new" ];
     };
   };

pkgs/top-level/all-packages.nix

···
     stdenv = gcc11Stdenv;
   };
 
-  new-lg4ff = callPackage ../os-specific/linux/new-lg4ff {
-    inherit (linuxPackages) kernel;
-  };
-
   nmon = callPackage ../os-specific/linux/nmon { };
 
   hwdata = callPackage ../os-specific/linux/hwdata { };

pkgs/top-level/linux-kernels.nix

···
 
     mbp2018-bridge-drv = callPackage ../os-specific/linux/mbp-modules/mbp2018-bridge-drv { };
 
+    new-lg4ff = callPackage ../os-specific/linux/new-lg4ff { };
+
     nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
 
     nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { }));