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/cross | |
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/cross')
-rw-r--r-- | pkgs/stdenv/cross/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index e684c14da4a..37f403acee9 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -1,10 +1,10 @@ { lib -, system, platform, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays }: let bootStages = import ../. { - inherit lib system platform overlays; + inherit lib localSystem overlays; crossSystem = null; # Ignore custom stdenvs when cross compiling for compatability config = builtins.removeAttrs config [ "replaceStdenv" ]; @@ -14,21 +14,25 @@ in bootStages ++ [ # Build Packages (vanillaPackages: { - inherit system platform crossSystem config overlays; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = crossSystem; + inherit config overlays; # Should be false, but we're trying to preserve hashes for now selfBuild = true; # It's OK to change the built-time dependencies allowCustomOverrides = true; stdenv = vanillaPackages.stdenv // { - # Needed elsewhere as a hacky way to pass the target - cross = crossSystem; overrides = _: _: {}; }; }) # Run Packages (buildPackages: { - inherit system platform crossSystem config overlays; + buildPlatform = localSystem; + hostPlatform = crossSystem; + targetPlatform = crossSystem; + inherit config overlays; selfBuild = false; stdenv = if crossSystem.useiOSCross or false then let |