diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-04-05 15:22:45 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-04-06 12:41:44 -0400 |
| commit | c6f7d4367894047592cc412740f0c1f5b2ca2b59 (patch) | |
| tree | 0079c8f9633c2c48e2e57459eb4e40ee17bb31f8 /lib/systems/parse.nix | |
| parent | 15a2dca15c25279843374003c8ae553e3b4af385 (diff) | |
| download | nixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar nixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.gz nixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.bz2 nixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.lz nixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.xz nixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.zst nixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.zip | |
nixpkgs module: Clean up platform options
- `localSystem` is added, it strictly supercedes system - `crossSystem`'s description mentions `localSystem` (and vice versa). - No more weird special casing I don't even understand TEMP
Diffstat (limited to 'lib/systems/parse.nix')
| -rw-r--r-- | lib/systems/parse.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 641a7f5d758..0dd8999f5f9 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -201,7 +201,7 @@ rec { ################################################################################ - types.system = mkOptionType { + types.parsedPlatform = mkOptionType { name = "system"; description = "fully parsed representation of llvm- or nix-style platform tuple"; merge = mergeOneOption; @@ -215,7 +215,7 @@ rec { isSystem = isType "system"; mkSystem = components: - assert types.system.check components; + assert types.parsedPlatform.check components; setType "system" components; mkSkeletonFromList = l: { |