pkgs/linux-4.7: Provide patches via callPackage

As mentioned in the previous commit, kernel patches from
boot.kernelPatches are added to the kernel package via .override.

Unfortunately, .override overrides the function arguments of the
expression referenced from callPackage, so having the patches inside the
package expression itself will discard those patches once there is an
override.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 6 insertions, 1 deletions

diff --git a/pkgs/default.nix b/pkgs/default.nix
index c48c6212..ecaacac0 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -42,7 +42,12 @@ let
 
     kernel = {
       bfqsched = callPackage ./kernel/bfqsched { };
-      linux_4_7 = callPackage ./kernel/linux-4.7.nix { };
+      linux_4_7 = callPackage ./kernel/linux-4.7.nix {
+        kernelPatches = [
+          pkgs.kernelPatches.bridge_stp_helper
+          pkgs.kernelPatches.cpu-cgroup-v2."4.7"
+        ];
+      };
     };
 
     openlab = pkgs.recurseIntoAttrs {