diff options
| author | Guillaume Girol <symphorien@users.noreply.github.com> | 2021-07-14 18:44:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 18:44:18 +0000 |
| commit | 9d4a4d7c622a774dd1b80ca0bd69fb3e50c397ce (patch) | |
| tree | bfc114be365bb0789d86d8540aff7305b7a87657 /pkgs/os-specific/linux | |
| parent | 6630d8e9bb67fdc6023a4731d4c8f441e7903134 (diff) | |
| parent | 3f63c29812e0f1fd1c8763e746de79ae08da4c10 (diff) | |
| download | nixpkgs-9d4a4d7c622a774dd1b80ca0bd69fb3e50c397ce.tar nixpkgs-9d4a4d7c622a774dd1b80ca0bd69fb3e50c397ce.tar.gz nixpkgs-9d4a4d7c622a774dd1b80ca0bd69fb3e50c397ce.tar.bz2 nixpkgs-9d4a4d7c622a774dd1b80ca0bd69fb3e50c397ce.tar.lz nixpkgs-9d4a4d7c622a774dd1b80ca0bd69fb3e50c397ce.tar.xz nixpkgs-9d4a4d7c622a774dd1b80ca0bd69fb3e50c397ce.tar.zst nixpkgs-9d4a4d7c622a774dd1b80ca0bd69fb3e50c397ce.zip | |
Merge pull request #127918 from misuzu/linux-lirc
linux: enable LIRC
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 355e653c8ea..fce451ee889 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -846,6 +846,8 @@ let X86_AMD_PLATFORM_DEVICE = yes; X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes; + LIRC = mkMerge [ (whenOlder "4.16" module) (whenAtLeast "4.17" yes) ]; + } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable CPU/memory hotplug support # Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot |