From ba459a0bf380a4da440c3162ffeecd03d11be301 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 18 Dec 2010 17:56:04 +0000
Subject: [PATCH] * Fix the broken installer
 (http://hydra.nixos.org/build/811980).  The   hardware scan was generating a
 hardware.nix containing   "pkgs.linuxPackages" without having "pkgs" in
 scope.  Also, it   shouldn't define boot.kernelPackages.

svn path=/nixos/trunk/; revision=25192
---
 modules/installer/tools/nixos-hardware-scan.pl | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index b26358e1078..38220c4fb78 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -103,7 +103,7 @@ sub pciCheck {
          $device eq "0x432c" || $device eq "0x432d" || $device eq "0x4353" ||
          $device eq "0x4357") )
      {
-        push @modulePackages, "kernelPackages.broadcom_sta";
+        push @modulePackages, "config.boot.kernelPackages.broadcom_sta";
         push @kernelModules, "wl";
      }
 
@@ -242,7 +242,7 @@ my $attrs = multiLineList("  ", removeDups @attrs);
 print <<EOF ;
 # This is a generated file.  Do not modify!
 # Make changes to /etc/nixos/configuration.nix instead.
-{modulesPath, ...}:
+{ config, pkgs, modulesPath, ... }:
 
 {
   require = [
@@ -250,12 +250,9 @@ print <<EOF ;
     "\${modulesPath}/installer/scan/not-detected.nix"
   ];
 
-  boot = rec {
-    initrd.kernelModules = [ $initrdKernelModules ];
-    kernelModules = [ $kernelModules ];
-    kernelPackages = pkgs.linuxPackages;
-    extraModulePackages = [ $modulePackages ];
-  };
+  boot.initrd.kernelModules = [ $initrdKernelModules ];
+  boot.kernelModules = [ $kernelModules ];
+  boot.extraModulePackages = [ $modulePackages ];
 
   nix.maxJobs = $cpus;