From ecef3b1f617e2db6e8ad1e13cc620a4de5f56299 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 22 May 2008 19:30:00 +0000
Subject: [PATCH] Passing packages list to extraModulePackages

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

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index a69832d8269..05420975d5f 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -19,7 +19,7 @@ rec {
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
       extraTTYs = [7 8]; # manual, rogue
-      extraModulePackages = [system.kernelPackages.aufs];
+      extraModulePackages = pkgs: [system.kernelPackages.aufs];
       
       #kernelPackages = pkgs: pkgs.kernelPackages_2_6_25;
       
diff --git a/system/options.nix b/system/options.nix
index 37d6023eef3..69f4971e833 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -140,8 +140,8 @@
     };
 
     extraModulePackages = mkOption {
-      default = [];
-      # !!! example = [pkgs.aufs pkgs.nvidiaDrivers];
+      default = pkgs: [];
+      # !!! example = pkgs: [pkgs.aufs pkgs.nvidiaDrivers];
       description = ''
         A list of additional packages supplying kernel modules.
       '';
diff --git a/system/system.nix b/system/system.nix
index c55e31914af..47b3f5d1ab0 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -53,7 +53,7 @@ rec {
     # !!! 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
-    ++ config.boot.extraModulePackages
+    ++ (config.boot.extraModulePackages pkgs)
   );