From 7ebc1821f932b2d808b373d7254b307a4db7f1aa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 27 Nov 2008 20:35:26 +0000
Subject: [PATCH] Fixing build for new kernels when Intel WiFi firmware is used

svn path=/nixos/trunk/; revision=13470
---
 system/system.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index 9a17ef6fccd..fa49383e048 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -43,7 +43,8 @@ rec {
   # directory.
   modulesTree = pkgs.aggregateModules (
     [kernel]
-    ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi
+    # Merged into mainline kernel
+    # ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi
     # !!! this should be declared by the xserver Upstart job.
     ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
     ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007