diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-10-27 17:35:54 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-10-27 17:35:54 +0200 |
commit | cb9c8c651431f311ae9df2711ba105e949cdd217 (patch) | |
tree | 7c9448bfc8dc4dd075e2ee37944d4b14b2f73a9d | |
parent | 822dc8eb151d045f40816e13e6a731672bd2130b (diff) |
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>
-rw-r--r-- | pkgs/default.nix | 7 | ||||
-rw-r--r-- | pkgs/kernel/linux-4.7.nix | 5 |
2 files changed, 7 insertions, 5 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 { diff --git a/pkgs/kernel/linux-4.7.nix b/pkgs/kernel/linux-4.7.nix index 6f6de003..5650b8d6 100644 --- a/pkgs/kernel/linux-4.7.nix +++ b/pkgs/kernel/linux-4.7.nix @@ -12,10 +12,7 @@ in import generic (args // rec { sha256 = "1p2r5d0jcrak9gxp0339g9z198x9laf09h08ck4jllhhaajrnicj"; }; - kernelPatches = (args.kernelPatches or []) ++ [ - pkgs.kernelPatches.bridge_stp_helper - pkgs.kernelPatches.cpu-cgroup-v2."4.7" - ]; + kernelPatches = args.kernelPatches; features.iwlwifi = true; features.efiBootStub = true; |