diff options
author | Andrew Childs <lorne@cons.org.nz> | 2020-02-27 23:55:21 +0900 |
---|---|---|
committer | Andrew Childs <lorne@cons.org.nz> | 2020-02-27 23:57:44 +0900 |
commit | b83164a0499475c72affebb21e7f513e7fbd0ccd (patch) | |
tree | d774260188bd6c0cf8dd58cf99bdbaee45596b7f /nixos/modules/system/activation/top-level.nix | |
parent | 98791845cbdeba1d8dd08a5b822d92e9a8cd6873 (diff) | |
download | nixpkgs-b83164a0499475c72affebb21e7f513e7fbd0ccd.tar nixpkgs-b83164a0499475c72affebb21e7f513e7fbd0ccd.tar.gz nixpkgs-b83164a0499475c72affebb21e7f513e7fbd0ccd.tar.bz2 nixpkgs-b83164a0499475c72affebb21e7f513e7fbd0ccd.tar.lz nixpkgs-b83164a0499475c72affebb21e7f513e7fbd0ccd.tar.xz nixpkgs-b83164a0499475c72affebb21e7f513e7fbd0ccd.tar.zst nixpkgs-b83164a0499475c72affebb21e7f513e7fbd0ccd.zip |
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
Diffstat (limited to 'nixos/modules/system/activation/top-level.nix')
-rw-r--r-- | nixos/modules/system/activation/top-level.nix | 1 |
1 files changed, 1 insertions, 0 deletions
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 ] |