diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2016-12-24 10:55:11 -0800 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2017-01-24 11:37:56 -0500 |
| commit | 92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6 (patch) | |
| tree | 810ca0e0f429364adcf030867095fffe655cb3ab /pkgs/stdenv/default.nix | |
| parent | 5b88f09ec4d6b3ac953cd9d252ebfd6663205c57 (diff) | |
| download | nixpkgs-92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6.tar nixpkgs-92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6.tar.gz nixpkgs-92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6.tar.bz2 nixpkgs-92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6.tar.lz nixpkgs-92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6.tar.xz nixpkgs-92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6.tar.zst nixpkgs-92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6.zip | |
top-level: Lay the groundwork for `{build,host,target}Platform`
The long term goal is a big replace:
{ inherit system platform; } => buildPlatform
crossSystem => hostPlatform
stdenv.cross => targetPlatform
And additionally making sure each is defined even when not cross compiling.
This commit refactors the bootstrapping code along that vision, but leaves
the old identifiers with their null semantics in place so packages can be
modernized incrementally.
Diffstat (limited to 'pkgs/stdenv/default.nix')
| -rw-r--r-- | pkgs/stdenv/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index f60ffec4b56..78dbde13b89 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -7,7 +7,7 @@ { # Args just for stdenvs' usage lib # Args to pass on to the pkgset builder, too -, system, platform, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays } @ args: let @@ -51,4 +51,4 @@ in "i686-cygwin" = stagesNative; "x86_64-cygwin" = stagesNative; "x86_64-freebsd" = stagesFreeBSD; - }.${system} or stagesNative + }.${localSystem.system} or stagesNative |