From 3166d9f687cffe0aacc1b13163bb57503854d5e9 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 25 Jan 2008 12:54:27 +0000
Subject: [PATCH] Made iwlwifi optional, with false default

svn path=/nixos/trunk/; revision=10288
---
 system/options.nix | 2 +-
 system/system.nix  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 3f2197a40d4..d3679bc0bf7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -341,7 +341,7 @@
     };
 
     enableIntel3945ABGFirmware = mkOption {
-      default = true;
+      default = false;
       description = "
         This option enables automatic loading of the firmware for the Intel
         PRO/Wireless 3945ABG.
diff --git a/system/system.nix b/system/system.nix
index 72cd8dfedc8..6943b97edc9 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -147,7 +147,8 @@ rec {
   # single tree of symlinks because modprobe only supports one
   # directory.
   modulesTree = pkgs.module_aggregation (
-    [kernel pkgs.iwlwifi]
+    [kernel]
+	++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi
     # !!! this should be declared by the xserver Upstart job.
     ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers
   );