summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/linux-4.2.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-4.2.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.2.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix
index ff5fd912db30..aa87249e5c90 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix
@@ -15,4 +15,12 @@ import ./generic.nix (args // rec {
   features.needsCifsUtils = true;
   features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
+
+  # cherry-pick from upstream to resolve a licensing problem that prevents
+  # compiling the broadcom-sta wireless driver on kernels >= 4.2
+  # see: https://github.com/longsleep/bcmwl-ubuntu/issues/6
+  kernelPatches = [ {
+    name = "flush-workqueue-export";
+    patch = ./flush_workqueue-export.patch;
+  } ];
 } // (args.argsOverride or {}))