From 2a6e4ae49a891adc7c0562fda08b17d60beb1b4f Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Tue, 11 Sep 2018 12:04:00 +0200 Subject: Revert "top-level: Deprecate top-level `{build,host,target}Platform`" This reverts commit e51f736076548459f36a1250de4bf6867f880b66. --- pkgs/top-level/stage.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'pkgs/top-level/stage.nix') diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index ff09fa5ad1f..06978d1067b 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -79,17 +79,11 @@ let # The old identifiers for cross-compiling. These should eventually be removed, # and the packages that rely on them refactored accordingly. - platformCompat = self: super: { - buildPlatform = lib.warn - "top-level `buildPlatform` is deprecated since 18.09. Please use `stdenv.buildPlatform`." - super.stdenv.buildPlatform; - hostPlatform = lib.warn - "top-level `hostPlatform` is deprecated since 18.09. Please use `stdenv.hostPlatform`." - super.stdenv.hostPlatform; - targetPlatform = lib.warn - "top-level `targetPlatform` is deprecated since 18.09. Please use `stdenv.targetPlatform`." - super.stdenv.targetPlatform; - inherit (super.stdenv.hostPlatform) system; + platformCompat = self: super: let + inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; + in { + inherit buildPlatform hostPlatform targetPlatform; + inherit (buildPlatform) system; }; splice = self: super: import ./splice.nix lib self (buildPackages != null); -- cgit 1.4.1