From ce416779bbb5d86210cbf2cc5060cc81faf53c94 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 4 Mar 2020 23:24:22 +0900 Subject: nixos/activation: use eval-config's system argument for nesting This avoids a possible surprise if the user is using `nixpkgs.system` and `nesting.children`. `nesting.children` is expected to ignore all parent configuration so we shouldn't propagate the user-facing option `nixpkgs.system`. To avoid doing so, we introduce a new internal option for holding the value passed to eval-config.nix, and use that when recursing for nesting. --- nixos/modules/system/activation/top-level.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/system/activation/top-level.nix') diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 346e0b64230..14bd751ce32 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -15,7 +15,7 @@ let map (childConfig: (import ../../../lib/eval-config.nix { inherit baseModules; - system = config.nixpkgs.system; + system = config.nixpkgs.initialSystem; modules = (optionals inheritParent modules) ++ [ ./no-clone.nix ] -- cgit 1.4.1