diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-02-25 23:07:47 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-25 23:07:47 +0100 |
| commit | 0e1319f03ffe5b9b365d056c1bc5d18e1a5b75ea (patch) | |
| tree | d59aec9ea80def23dee4d4cda3e86a68954e037e /pkgs/os-specific | |
| parent | 4a4c432f06c872dc618ab655b9968a062430db01 (diff) | |
| download | nixlib-0e1319f03ffe5b9b365d056c1bc5d18e1a5b75ea.tar nixlib-0e1319f03ffe5b9b365d056c1bc5d18e1a5b75ea.tar.gz nixlib-0e1319f03ffe5b9b365d056c1bc5d18e1a5b75ea.tar.bz2 nixlib-0e1319f03ffe5b9b365d056c1bc5d18e1a5b75ea.tar.lz nixlib-0e1319f03ffe5b9b365d056c1bc5d18e1a5b75ea.tar.xz nixlib-0e1319f03ffe5b9b365d056c1bc5d18e1a5b75ea.tar.zst nixlib-0e1319f03ffe5b9b365d056c1bc5d18e1a5b75ea.zip | |
linux-3.10: fixup config by a slightly hacky way
For explanation see: https://github.com/NixOS/nixpkgs/pull/13405#issuecomment-188357637
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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' |