public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check for broadcom wireless driver - patch by Vladimír Čunát

Browse Source 
svn path=/nixos/trunk/; revision=25045
This commit is contained in:
Tobias Hammerschmidt 2010-12-09 19:08:33 +00:00
parent ef243b7fc2
commit 05c25d3fb2
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/installer/tools/nixos-hardware-scan.pl
View File

@ -7,6 +7,7 @@ use File::Basename;
my @attrs = (); my @attrs = ();
my @kernelModules = (); my @kernelModules = ();
my @initrdKernelModules = (); my @initrdKernelModules = ();
my @modulePackages = ();
sub debug { 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 # Can't rely on $module here, since the module may not be loaded
# due to missing firmware. Ideally we would check modules.pcimap # due to missing firmware. Ideally we would check modules.pcimap
# here. # here.
@ -222,6 +236,7 @@ sub multiLineList {
my $initrdKernelModules = toNixExpr(removeDups @initrdKernelModules); my $initrdKernelModules = toNixExpr(removeDups @initrdKernelModules);
my $kernelModules = toNixExpr(removeDups @kernelModules); my $kernelModules = toNixExpr(removeDups @kernelModules);
my $modulePackages = toNixExpr(removeDups @modulePackages);
my $attrs = multiLineList(" ", removeDups @attrs); my $attrs = multiLineList(" ", removeDups @attrs);
print <<EOF ; print <<EOF ;
@ -235,8 +250,12 @@ print <<EOF ;
"\${modulesPath}/installer/scan/not-detected.nix" "\${modulesPath}/installer/scan/not-detected.nix"
]; ];
boot.initrd.kernelModules = [ $initrdKernelModules ]; boot = rec {
boot.kernelModules = [ $kernelModules ]; initrd.kernelModules = [ $initrdKernelModules ];
kernelModules = [ $kernelModules ];
kernelPackages = pkgs.linuxPackages;
extraModulePackages = [ $modulePackages ];
};
nix.maxJobs = $cpus; nix.maxJobs = $cpus;