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/nix | |
parent | 5b88f09ec4d6b3ac953cd9d252ebfd6663205c57 (diff) | |
download | nixlib-92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6.tar nixlib-92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6.tar.gz nixlib-92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6.tar.bz2 nixlib-92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6.tar.lz nixlib-92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6.tar.xz nixlib-92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6.tar.zst nixlib-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/nix')
-rw-r--r-- | pkgs/stdenv/nix/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index a5f0a18464c1..9aece3ce829d 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -9,9 +9,9 @@ assert crossSystem == null; bootStages ++ [ (prevStage: let inherit (prevStage) stdenv; - inherit (stdenv) system platform; in { - inherit system platform crossSystem config; + inherit (prevStage) buildPlatform hostPlatform targetPlatform; + inherit config overlays; stdenv = import ../generic rec { inherit config; |