From 9a5c77c581c5f680852e40501ae4685eea0b26e8 Mon Sep 17 00:00:00 2001
From: MatthiasBenaets <matthias.benaets@gmail.com>
Date: Thu, 2 Jun 2022 08:27:42 +0200
Subject: [PATCH] nixos/new-lg4ff: fix kernel selection

---
 nixos/modules/hardware/new-lg4ff.nix | 3 ++-
 pkgs/top-level/all-packages.nix      | 4 ----
 pkgs/top-level/linux-kernels.nix     | 2 ++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/hardware/new-lg4ff.nix b/nixos/modules/hardware/new-lg4ff.nix
index d1cdf0540fc6..3c7f66f8d89b 100644
--- a/nixos/modules/hardware/new-lg4ff.nix
+++ b/nixos/modules/hardware/new-lg4ff.nix
@@ -4,6 +4,7 @@ with lib;
 
 let
   cfg = config.hardware.new-lg4ff;
+  kernelPackages = config.boot.kernelPackages;
 in {
   options.hardware.new-lg4ff = {
     enable = mkOption {
@@ -19,7 +20,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     boot = {
-      extraModulePackages = [ pkgs.new-lg4ff ];
+      extraModulePackages = [ kernelPackages.new-lg4ff ];
       kernelModules = [ "hid-logitech-new" ];
     };
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68c03ac3d468..00ee40250e2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23097,10 +23097,6 @@ with pkgs;
     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 { };
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index a55ecc2b51ee..2f53fc73874e 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -343,6 +343,8 @@ in {
 
     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 { }));