diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2021-05-07 01:54:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-07 01:54:48 +0200 |
| commit | 0633b6aa747385d495e925ddc64356ce9312a589 (patch) | |
| tree | 1c0f9b435675fdb9674bd6218765ff1a2d56e5ee /nixos | |
| parent | 86878f63f9a57a128741ef6e6144780362396cac (diff) | |
| parent | 87c659ab94b99d31dd5b121ca35a2855a8b85081 (diff) | |
| download | nixlib-0633b6aa747385d495e925ddc64356ce9312a589.tar nixlib-0633b6aa747385d495e925ddc64356ce9312a589.tar.gz nixlib-0633b6aa747385d495e925ddc64356ce9312a589.tar.bz2 nixlib-0633b6aa747385d495e925ddc64356ce9312a589.tar.lz nixlib-0633b6aa747385d495e925ddc64356ce9312a589.tar.xz nixlib-0633b6aa747385d495e925ddc64356ce9312a589.tar.zst nixlib-0633b6aa747385d495e925ddc64356ce9312a589.zip | |
Merge pull request #121870 from Pacman99/pass-specialargs
lib/modules: pass specialArgs to modules
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/activation/top-level.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 9dbca4e33f38..6751ca3f2ee7 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modules, baseModules, ... }: +{ config, lib, pkgs, modules, baseModules, specialArgs, ... }: with lib; @@ -13,7 +13,7 @@ let # !!! fix this children = mapAttrs (childName: childConfig: (import ../../../lib/eval-config.nix { - inherit baseModules; + inherit baseModules specialArgs; system = config.nixpkgs.initialSystem; modules = (optionals childConfig.inheritParentConfig modules) |