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/custom/default.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/custom/default.nix')
-rw-r--r-- | pkgs/stdenv/custom/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index d7e9bf53bed1..d5dc977b37a7 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -1,12 +1,12 @@ { lib -, system, platform, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays }: assert crossSystem == null; let bootStages = import ../. { - inherit lib system platform crossSystem overlays; + inherit lib localSystem crossSystem overlays; # Remove config.replaceStdenv to ensure termination. config = builtins.removeAttrs config [ "replaceStdenv" ]; }; @@ -15,7 +15,10 @@ in bootStages ++ [ # Additional stage, built using custom stdenv (vanillaPackages: { - inherit system platform crossSystem config overlays; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config overlays; stdenv = config.replaceStdenv { pkgs = vanillaPackages; }; }) |