From 0e1319f03ffe5b9b365d056c1bc5d18e1a5b75ea Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 25 Feb 2016 23:07:47 +0100 Subject: [PATCH] linux-3.10: fixup config by a slightly hacky way For explanation see: https://github.com/NixOS/nixpkgs/pull/13405#issuecomment-188357637 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index fc54715ea7b8..4de27fd3000d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -362,7 +362,7 @@ with stdenv.lib; X86_MCE y # PCI-Expresscard hotplug support - HOTPLUG_PCI_PCIE y + ${optionalString (versionAtLeast version "3.12") "HOTPLUG_PCI_PCIE y"} # Linux containers. NAMESPACES? y # Required by 'unshare' used by 'nixos-install'