From 05c25d3fb2ae7de877695593a4189c0d4c23fab3 Mon Sep 17 00:00:00 2001
From: Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de>
Date: Thu, 9 Dec 2010 19:08:33 +0000
Subject: [PATCH] =?UTF-8?q?check=20for=20broadcom=20wireless=20driver=20-?=
 =?UTF-8?q?=20patch=20by=20Vladim=C3=ADr=20=C4=8Cun=C3=A1t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=25045
---
 .../installer/tools/nixos-hardware-scan.pl    | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index 56549f99235..b26358e1078 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -7,6 +7,7 @@ use File::Basename;
 my @attrs = ();
 my @kernelModules = ();
 my @initrdKernelModules = ();
+my @modulePackages = ();
 
 
 sub debug {
@@ -93,6 +94,19 @@ sub pciCheck {
         }
     }
 
+    # broadcom STA driver (wl.ko)
+    # list taken from http://www.broadcom.com/docs/linux_sta/README.txt
+    if ($vendor eq "0x14e4" &&
+        ($device eq "0x4311" || $device eq "0x4312" || $device eq "0x4313" ||
+         $device eq "0x4315" || $device eq "0x4327" || $device eq "0x4328" ||
+         $device eq "0x4329" || $device eq "0x432a" || $device eq "0x432b" ||
+         $device eq "0x432c" || $device eq "0x432d" || $device eq "0x4353" ||
+         $device eq "0x4357") )
+     {
+        push @modulePackages, "kernelPackages.broadcom_sta";
+        push @kernelModules, "wl";
+     }
+
     # Can't rely on $module here, since the module may not be loaded
     # due to missing firmware.  Ideally we would check modules.pcimap
     # here.
@@ -222,6 +236,7 @@ sub multiLineList {
 
 my $initrdKernelModules = toNixExpr(removeDups @initrdKernelModules);
 my $kernelModules = toNixExpr(removeDups @kernelModules);
+my $modulePackages = toNixExpr(removeDups @modulePackages);
 my $attrs = multiLineList("  ", removeDups @attrs);
 
 print <<EOF ;
@@ -235,8 +250,12 @@ print <<EOF ;
     "\${modulesPath}/installer/scan/not-detected.nix"
   ];
 
-  boot.initrd.kernelModules = [ $initrdKernelModules ];
-  boot.kernelModules = [ $kernelModules ];
+  boot = rec {
+    initrd.kernelModules = [ $initrdKernelModules ];
+    kernelModules = [ $kernelModules ];
+    kernelPackages = pkgs.linuxPackages;
+    extraModulePackages = [ $modulePackages ];
+  };
 
   nix.maxJobs = $cpus;