diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-05 21:47:48 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-07 12:55:02 -0400 |
| commit | a302d7360f201cc4fcfb4a43a432b31536795507 (patch) | |
| tree | 29df099a1fabe012311c9db0ce7488b2f53f95f1 /pkgs/stdenv/cross | |
| parent | afc20239939829490e2d7a3beb7028b7c1dcc803 (diff) | |
top-level: {build,host,target}Platform are defined in the stdenv instead
See #27069 for a discussion of this
Diffstat (limited to 'pkgs/stdenv/cross')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 125c4300975a..c83714d01f2c 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -14,21 +14,18 @@ in bootStages ++ [ # Build Packages (vanillaPackages: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = crossSystem; inherit config overlays; selfBuild = false; + stdenv = + assert vanillaPackages.hostPlatform == localSystem; + assert vanillaPackages.targetPlatform == localSystem; + vanillaPackages.stdenv.override { targetPlatform = crossSystem; }; # It's OK to change the built-time dependencies allowCustomOverrides = true; - inherit (vanillaPackages) stdenv; }) # Run Packages (buildPackages: { - buildPlatform = localSystem; - hostPlatform = crossSystem; - targetPlatform = crossSystem; inherit config overlays; selfBuild = false; stdenv = buildPackages.makeStdenvCross { |