From 822dc8eb151d045f40816e13e6a731672bd2130b Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 27 Oct 2016 17:27:06 +0200 Subject: hardware/t100ha: Switch to use boot.kernelPatches The implementation of boot.kernelPatches uses .override and passes back the original kernelPatches attribute to the patches that are going to be added from boot.kernelPatches. However, the T100HA module already uses .override to pass these patches but without re-using the existing patches. So instead of just adding preexisting patches to the kernelPatches attribute, let's just switch to boot.kernelPatches, which should also allow overrides and introspection from different NixOS modules. Signed-off-by: aszlig --- modules/hardware/t100ha/default.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'modules/hardware') diff --git a/modules/hardware/t100ha/default.nix b/modules/hardware/t100ha/default.nix index 6f216987..ac0a0be4 100644 --- a/modules/hardware/t100ha/default.nix +++ b/modules/hardware/t100ha/default.nix @@ -17,21 +17,21 @@ in { $install "$params" "$out/$fwbase.txt" ''); + boot.kernelPatches = [ + { name = "backlight"; + patch = ./backlight.patch; + } + { name = "meta-keys"; + patch = ./meta-keys.patch; + } + { name = "sdio"; + patch = ./sdio.patch; + } + ]; + boot.kernelPackages = let nixpkgs = import ../../../nixpkgs-path.nix; t100haKernel = pkgs.vuizvui.kernel.linux_4_7.override { - kernelPatches = [ - { name = "backlight"; - patch = ./backlight.patch; - } - { name = "meta-keys"; - patch = ./meta-keys.patch; - } - { name = "sdio"; - patch = ./sdio.patch; - } - ]; - # Missing device drivers: # # 808622B8 -> Intel(R) Imaging Signal Processor 2401 -- cgit 1.4.1