From 3ffead673bc0a64e7691c86634be0738236a4af3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 28 Jan 2016 15:33:02 +0100 Subject: machines/tishtushi: Fix overriding kernel patches The commit NixOS/nixpkgs@23f5e3c directly provides kernelPatches to the build attributes and we did an override by passing back the kernelPatches attributes from the result instead of the original arguments. So instead of using the resulting arguments, we simply reinject the kernelPatches attribute from the input arguments. Tested using: nix-instantiate --eval --strict -I nixpkgs=/home/aszlig/nixpkgs -E ' with import ; let with ((import ./machines {}).aszlig.tishtushi) eval; in map (getAttr "name") eval.config.boot.kernelPackages.kernel.kernelPatches ' Signed-off-by: aszlig --- machines/aszlig/tishtushi.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'machines') diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix index d98e8865..a3f281f4 100644 --- a/machines/aszlig/tishtushi.nix +++ b/machines/aszlig/tishtushi.nix @@ -24,9 +24,9 @@ in { DEFAULT_IOSCHED "bfq" ''; }; - kernel = origKernel.override { - kernelPatches = origKernel.kernelPatches ++ singleton bfqsched; - }; + kernel = origKernel.override (origArgs: { + kernelPatches = origArgs.kernelPatches ++ singleton bfqsched; + }); in linuxPackagesFor kernel kernelPackages; initrd.kernelModules = [ "fbcon" "usb_storage" ]; -- cgit 1.4.1