From b83164a0499475c72affebb21e7f513e7fbd0ccd Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 27 Feb 2020 23:55:21 +0900 Subject: nixos/activation: propagate system to nested configurations The current behavior lets `system` default to `builtins.currentSystem`. The system value specified to `eval-config.nix` has very low precedence, so this should compose properly. Fixes #80806 --- nixos/modules/system/activation/top-level.nix | 1 + 1 file changed, 1 insertion(+) (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 f67d2900561..346e0b64230 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -15,6 +15,7 @@ let map (childConfig: (import ../../../lib/eval-config.nix { inherit baseModules; + system = config.nixpkgs.system; modules = (optionals inheritParent modules) ++ [ ./no-clone.nix ] -- cgit 1.4.1