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

Rewrite the optionDeclarations to collect all options definitions.

Browse Source 
svn path=/nixos/trunk/; revision=12521
This commit is contained in:
Nicolas Pierron 2008-08-06 18:43:53 +00:00
parent 92560a1dc0
commit 53bdeb43e3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
system/system.nix
View File

@ -7,7 +7,7 @@
rec { rec {
configComponents = [ configComponents = [
configuration configuration
optionDeclarations (import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;})
]; ];
noOption = name: values: noOption = name: values:
@ -21,7 +21,10 @@ rec {
pkgs configComponents; pkgs configComponents;
optionDeclarations = optionDeclarations =
import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;}; pkgs.lib.finalOptionSetsFun
pkgs.lib.filterOptionSets
pkgs configComponents
config;
pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;}; pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;};