From ecab3edeb79a5257974d24acd04e5c9b3c245e6c Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sun, 8 Jan 2023 23:18:53 +0200
Subject: [PATCH] top-level: move top-level {build,host,target}Platform to
 aliases

deprecation was attempted in e51f736076548459f36a1250de4bf6867f880b66

but had to be reverted in 2a6e4ae49a891adc7c0562fda08b17d60beb1b4f
---
 pkgs/top-level/aliases.nix | 1 +
 pkgs/top-level/stage.nix   | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6e7595ea6567..4d7a9e3a0d85 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1764,6 +1764,7 @@ mapAliases ({
   zyn-fusion = zynaddsubfx; # Added 2022-08-05
 
   inherit (stdenv.hostPlatform) system; # Added 2021-10-22
+  inherit (stdenv) buildPlatform hostPlatform targetPlatform; # Added 2023-01-09
 
   # LLVM packages for (integration) testing that should not be used inside Nixpkgs:
   llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git {
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 3669b622e715..e5412c409ed5 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -138,14 +138,6 @@ let
     inherit stdenv;
   };
 
-  # The old identifiers for cross-compiling. These should eventually be removed,
-  # and the packages that rely on them refactored accordingly.
-  platformCompat = self: super: let
-    inherit (super.stdenv) buildPlatform hostPlatform targetPlatform;
-  in {
-    inherit buildPlatform hostPlatform targetPlatform;
-  };
-
   splice = self: super: import ./splice.nix lib self (adjacentPackages != null);
 
   allPackages = self: super:
@@ -282,7 +274,6 @@ let
   # previous bootstrapping phases which have already been overlayed.
   toFix = lib.foldl' (lib.flip lib.extends) (self: {}) ([
     stdenvBootstappingAndPlatforms
-    platformCompat
     stdenvAdapters
     trivialBuilders
     splice