diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2017-03-23 20:49:28 -0400 |
---|---|---|
committer | John Ericson <Ericson2314@Yahoo.com> | 2017-04-17 17:13:01 -0400 |
commit | 3efc661a1de6a2ce9b98aa39283e68914297b8d7 (patch) | |
tree | cc7467715da0a521a692c13b825cf8cc67fa2d98 /lib | |
parent | d86caa3216dce17f54c1505a751cf5b403fd8bcf (diff) |
Elaborate `localSystem` and `crossSystem` in a consistent manner
Diffstat (limited to 'lib')
-rw-r--r-- | lib/systems/default.nix | 18 | ||||
-rw-r--r-- | lib/systems/platforms.nix | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 70d431837daac..d956969a18f92 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -2,4 +2,22 @@ rec { doubles = import ./doubles.nix; parse = import ./parse.nix; platforms = import ./platforms.nix; + + # Elaborate a `localSystem` or `crossSystem` so that it contains everything + # necessary. + # + # `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 + final = { + # Prefer to parse `config` as it is strictly more informative. + parsed = parse.mkSystemFromString (if args ? config then args.config else args.system); + # Either of these can be losslessly-extracted from `parsed` iff parsing succeeds. + system = parse.doubleFromSystem final.parsed; + config = parse.tripleFromSystem final.parsed; + # Just a guess, based on `system` + platform = platforms.selectBySystem final.system; + } // args; + in final; } diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 665950766f7e7..4322c8e2ff687 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -474,7 +474,7 @@ rec { }; }; - selectPlatformBySystem = system: { + selectBySystem = system: { "i686-linux" = pc32; "x86_64-linux" = pc64; "armv5tel-linux" = sheevaplug; |