diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2022-01-04 22:00:00 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2022-01-10 12:26:59 +0100 |
| commit | 25caf736d5c16fa0c026c26ff4e7b7779fcbb7ae (patch) | |
| tree | 814635010c6f331302b75bf78050086460f737fd /nixos/lib/eval-config.nix | |
| parent | e31e096b667f671aea424681f2b4a65e385efe50 (diff) | |
| download | nixpkgs-25caf736d5c16fa0c026c26ff4e7b7779fcbb7ae.tar nixpkgs-25caf736d5c16fa0c026c26ff4e7b7779fcbb7ae.tar.gz nixpkgs-25caf736d5c16fa0c026c26ff4e7b7779fcbb7ae.tar.bz2 nixpkgs-25caf736d5c16fa0c026c26ff4e7b7779fcbb7ae.tar.lz nixpkgs-25caf736d5c16fa0c026c26ff4e7b7779fcbb7ae.tar.xz nixpkgs-25caf736d5c16fa0c026c26ff4e7b7779fcbb7ae.tar.zst nixpkgs-25caf736d5c16fa0c026c26ff4e7b7779fcbb7ae.zip | |
nixos/eval-config: Layer on top of nixos/eval-config-minimal
Diffstat (limited to 'nixos/lib/eval-config.nix')
| -rw-r--r-- | nixos/lib/eval-config.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 62d09b8173b..8ea82b30f16 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -33,6 +33,8 @@ let pkgs_ = pkgs; in let + evalModulesMinimal = (import ./eval-config-minimal.nix { inherit lib; bypassEvalModulesWarning = true; }).evalModules; + pkgsModule = rec { _file = ./eval-config.nix; key = _file; @@ -70,11 +72,9 @@ let }; allUserModules = modules ++ legacyModules; - noUserModules = lib.evalModules ({ - inherit prefix; + noUserModules = evalModulesMinimal ({ + inherit prefix specialArgs; modules = baseModules ++ extraModules ++ [ pkgsModule modulesModule ]; - specialArgs = - { modulesPath = builtins.toString ../modules; } // specialArgs; }); # Extra arguments that are useful for constructing a similar configuration. |