JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #175895 from MatthiasBenaets/new-lg4ff

Browse Source 
nixos/new-lg4ff: fix kernel selection
This commit is contained in:
Sergei Trofimovich 2022-06-02 07:32:37 +00:00 committed by GitHub
commit ac4e48e03e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/hardware/new-lg4ff.nix
View File

@ -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" ];
};
};

4
pkgs/top-level/all-packages.nix
View File

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

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

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