b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

svn path=/nixos/branches/modular-nixos/; revision=16592

Browse source
This commit is contained in:
Eelco Dolstra 2009-08-05 14:43:13 +00:00
parent 02c119a104
commit a9071b3283
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/eval-config.nix
View file

@ -6,8 +6,11 @@
, system ? builtins.currentSystem
, nixpkgs ? import ./from-env.nix "NIXPKGS" /etc/nixos/nixpkgs
, pkgs ? import nixpkgs {inherit system;}
, extraArgs ? {}
}:
let extraArgs_ = extraArgs; in
rec {
inherit nixpkgs pkgs;
@ -16,7 +19,7 @@ rec {
./check-config.nix
] ++ (import ../modules/module-list.nix);
extraArgs = {
extraArgs = extraArgs_ // {
inherit pkgs;
modulesPath = ../modules;
};