From 9f156f4a8a945dee1beeb49f6c2acb395c0af9c8 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 17:39:33 -0400
Subject: [PATCH] top-level: stdenv.cross vanquished

---
 doc/cross-compilation.xml | 5 -----
 pkgs/top-level/stage.nix  | 2 --
 2 files changed, 7 deletions(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 7ff35437611..650db718665 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -79,11 +79,6 @@
         </listitem>
       </varlistentry>
     </variablelist>
-    <note><para>
-      If you dig around nixpkgs, you may notice there is also <varname>stdenv.cross</varname>.
-      This field defined as <varname>hostPlatform</varname> when the host and build platforms differ, but otherwise not defined at all.
-      This field is obsolete and will soon disappear—please do not use it.
-    </para></note>
     <para>
       The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up.
       You can see examples of ones used in practice in <literal>lib.systems.examples</literal>; note how they are not all very consistent.
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index f6e7f41ed88..2a8f4ff4b3c 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -110,8 +110,6 @@ let
   in {
     stdenv = super.stdenv // {
       inherit (buildPlatform) platform;
-    } // lib.optionalAttrs (hostPlatform != buildPlatform) {
-      cross = hostPlatform;
     };
     inherit (buildPlatform) system platform;
   };