Merge pull request #121870 from Pacman99/pass-specialargs

lib/modules: pass specialArgs to modules
wip/little-gl
Robert Hensing 3 years ago committed by GitHub
commit 0633b6aa74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      lib/modules.nix
  2. 4
      nixos/modules/system/activation/top-level.nix

@ -128,7 +128,7 @@ rec {
let collected = collectModules
(specialArgs.modulesPath or "")
(modules ++ [ internalModule ])
({ inherit lib options config; } // specialArgs);
({ inherit lib options config specialArgs; } // specialArgs);
in mergeModules prefix (reverseList collected);
options = merged.matchedOptions;

@ -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)

Loading…
Cancel
Save