summaryrefslogtreecommitdiffstats
path: root/nixos/lib
diff options
context:
space:
mode:
authorNicolas B. Pierron <nicolas.b.pierron@gmail.com>2015-08-09 14:40:01 +0200
committerNicolas B. Pierron <nicolas.b.pierron@gmail.com>2015-08-09 17:52:34 +0200
commitc47e89623b168bc4058e10f08bf8ebd71cab366e (patch)
tree8f828cb4ea82a89a4cfe303a08396ff6bf100325 /nixos/lib
parent2c9c135ee23f831960a5ae234196aa8c5332c75e (diff)
Update option-usages.nix expression to work with newer version of the module system.
Diffstat (limited to 'nixos/lib')
-rw-r--r--nixos/lib/eval-config.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 97cb85a957f6..3e07df6c0860 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -17,6 +17,8 @@
baseModules ? import ../modules/module-list.nix
, # !!! See comment about args in lib/modules.nix
extraArgs ? {}
+, # !!! See comment about args in lib/modules.nix
+ specialArgs ? {}
, modules
, # !!! See comment about check in lib/modules.nix
check ? true
@@ -47,7 +49,7 @@ in rec {
inherit prefix check;
modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
args = extraArgs;
- specialArgs = { modulesPath = ../modules; };
+ specialArgs = { modulesPath = ../modules; } // specialArgs;
}) config options;
# These are the extra arguments passed to every module. In