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

Passing packages list to extraModulePackages

Browse Source 
svn path=/nixos/trunk/; revision=11884
This commit is contained in:
Michael Raskin 2008-05-22 19:30:00 +00:00
parent bb1ee3f190
commit ecef3b1f61
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration/rescue-cd.nix
View File

@ -19,7 +19,7 @@ rec {
# The label used to identify the installation CD. # The label used to identify the installation CD.
rootLabel = "NIXOS"; rootLabel = "NIXOS";
extraTTYs = [7 8]; # manual, rogue extraTTYs = [7 8]; # manual, rogue
extraModulePackages = [system.kernelPackages.aufs]; extraModulePackages = pkgs: [system.kernelPackages.aufs];
#kernelPackages = pkgs: pkgs.kernelPackages_2_6_25; #kernelPackages = pkgs: pkgs.kernelPackages_2_6_25;

4
system/options.nix
View File

@ -140,8 +140,8 @@
}; };
extraModulePackages = mkOption { extraModulePackages = mkOption {
default = []; default = pkgs: [];
# !!! example = [pkgs.aufs pkgs.nvidiaDrivers]; # !!! example = pkgs: [pkgs.aufs pkgs.nvidiaDrivers];
description = '' description = ''
A list of additional packages supplying kernel modules. A list of additional packages supplying kernel modules.
''; '';

2
system/system.nix
View File

@ -53,7 +53,7 @@ rec {
# !!! this should be declared by the xserver Upstart job. # !!! 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.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007 ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
++ config.boot.extraModulePackages ++ (config.boot.extraModulePackages pkgs)
); );