From f7b6f01da1362931d5c58ec1fd78922966b3e2d4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 29 Jul 2012 04:52:34 -0400
Subject: linux/kernel/manual-config: Cleanup

---
 pkgs/os-specific/linux/kernel/manual-config.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 777b33a84731..59fb1a6cd4c8 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -51,6 +51,7 @@ in
   # The kernel .config file
   config,
   # Manually specified features the kernel supports
+  # If unspecified, this will be autodetected from the .config
   features ? readFeatures config
 }:
 
@@ -100,7 +101,7 @@ stdenv.mkDerivation ({
   buildNativeInputs = [ perl nettools kmod ];
 
   makeFlags = commonMakeFlags;
-} // optionalAttrs features.modular {
+} // optionalAttrs (features ? modular && features.modular) {
   makeFlags = commonMakeFlags ++ [
     "MODLIB=\"$(out)/lib/modules/${modDirVersion}\""
   ];
-- 
cgit 1.4.1