summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKira Bruneau <kira.bruneau@pm.me>2022-08-03 18:00:41 -0400
committerKira Bruneau <kira.bruneau@pm.me>2022-08-17 11:05:35 -0400
commite114d6e0cdbe10f244bf2cd75bbcca9313154d6f (patch)
tree7e4a169860c3ec5e79b863f500beccaf27a41f48
parentlinuxPackages.xpadneo: fix license (diff)
downloadnixpkgs-origin/backport-184781-to-release-22.05.tar.gz
nixos/xpadneo: don't disable ertm on kernel 5.12 or laterorigin/backport-184781-to-release-22.05
The [v0.9.2 changelog](https://github.com/atar-axis/xpadneo/releases/tag/v0.9.2) mentions that ERTM should no longer be unconditionally disabled on kernels later than 5.12. (cherry picked from commit bda6036d2e7d6f9bd475727f861b3bede3c342ae)
-rw-r--r--nixos/modules/hardware/xpadneo.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/hardware/xpadneo.nix b/nixos/modules/hardware/xpadneo.nix
index dbc4ba212560..092f36729b31 100644
--- a/nixos/modules/hardware/xpadneo.nix
+++ b/nixos/modules/hardware/xpadneo.nix
@@ -15,7 +15,8 @@ in
# https://wiki.archlinux.org/index.php/Gamepad#Connect_Xbox_Wireless_Controller_with_Bluetooth
extraModprobeConfig =
mkIf
- config.hardware.bluetooth.enable
+ (config.hardware.bluetooth.enable &&
+ (lib.versionOlder config.boot.kernelPackages.kernel.version "5.12"))
"options bluetooth disable_ertm=1";
extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];