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/nix | |
parent | afc20239939829490e2d7a3beb7028b7c1dcc803 (diff) | |
download | nixpkgs-a302d7360f201cc4fcfb4a43a432b31536795507.tar nixpkgs-a302d7360f201cc4fcfb4a43a432b31536795507.tar.gz nixpkgs-a302d7360f201cc4fcfb4a43a432b31536795507.tar.bz2 nixpkgs-a302d7360f201cc4fcfb4a43a432b31536795507.tar.lz nixpkgs-a302d7360f201cc4fcfb4a43a432b31536795507.tar.xz nixpkgs-a302d7360f201cc4fcfb4a43a432b31536795507.tar.zst nixpkgs-a302d7360f201cc4fcfb4a43a432b31536795507.zip |
top-level: {build,host,target}Platform are defined in the stdenv instead
See #27069 for a discussion of this
Diffstat (limited to 'pkgs/stdenv/nix')
-rw-r--r-- | pkgs/stdenv/nix/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 7ab797ce91b..aaf6c523ea4 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -10,10 +10,13 @@ bootStages ++ [ (prevStage: let inherit (prevStage) stdenv; in { - inherit (prevStage) buildPlatform hostPlatform targetPlatform; inherit config overlays; stdenv = import ../generic rec { + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config; preHook = '' @@ -30,8 +33,6 @@ bootStages ++ [ nativeTools = false; nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr"; nativeLibc = true; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit stdenv; inherit (prevStage) binutils coreutils gnugrep; cc = prevStage.gcc.cc; |