diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-04 11:29:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-04 11:29:48 -0400 |
commit | 760c9995b0601e8679d303ce5c301fdb33fb2c5d (patch) | |
tree | 9b6c72336df80af5becb13c3d5400102b18bac67 /lib/systems/default.nix | |
parent | 9120dbf180fd173d8aa95ca4a89ac2ab529b675c (diff) | |
parent | 635b7625690d9f8f61da0a187e7ed4a7ec274fdc (diff) |
Merge pull request #60349 from matthewbauer/fix-60345
check-meta: use system tuple in platforms
Diffstat (limited to 'lib/systems/default.nix')
-rw-r--r-- | lib/systems/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 5e6d277be7d5..8aa413f53817 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -3,7 +3,6 @@ rec { doubles = import ./doubles.nix { inherit lib; }; - forMeta = import ./for-meta.nix { inherit lib; }; parse = import ./parse.nix { inherit lib; }; inspect = import ./inspect.nix { inherit lib; }; platforms = import ./platforms.nix { inherit lib; }; @@ -15,7 +14,9 @@ rec { # `parsed` is inferred from args, both because there are two options with one # clearly prefered, and to prevent cycles. A simpler fixed point where the RHS # always just used `final.*` would fail on both counts. - elaborate = args: let + elaborate = args': let + args = if lib.isString args' then { system = args'; } + else args'; final = { # Prefer to parse `config` as it is strictly more informative. parsed = parse.mkSystemFromString (if args ? config then args.config else args.system); |