From bd7d5b365799a145717d31122ebfd24b51fea117 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 19 Feb 2018 17:08:24 -0500 Subject: [PATCH] linux: Don't try to install firmware on newer kernels. This was disabled in torvalds/linux@5620a0d1aacd554ebebcff373e31107bb1ef7769 --- pkgs/os-specific/linux/kernel/manual-config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index ebbc69dec59..60fb0064513 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -79,7 +79,8 @@ let isModular = config.isYes "MODULES"; installsFirmware = (config.isEnabled "FW_LOADER") && - (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")); + (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) && + (stdenv.lib.versionOlder version "4.14"); in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // { passthru = { inherit version modDirVersion config kernelPatches configfile