diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-09-11 12:04:00 +0200 |
|---|---|---|
| committer | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-09-11 13:25:50 +0200 |
| commit | 2a6e4ae49a891adc7c0562fda08b17d60beb1b4f (patch) | |
| tree | 5e8e60a510d189a66ca1242d353f6fcb19ed8203 /pkgs/top-level/stage.nix | |
| parent | e02575b906b3a45f2c60018442d4082976dfd8da (diff) | |
| download | nixpkgs-2a6e4ae49a891adc7c0562fda08b17d60beb1b4f.tar nixpkgs-2a6e4ae49a891adc7c0562fda08b17d60beb1b4f.tar.gz nixpkgs-2a6e4ae49a891adc7c0562fda08b17d60beb1b4f.tar.bz2 nixpkgs-2a6e4ae49a891adc7c0562fda08b17d60beb1b4f.tar.lz nixpkgs-2a6e4ae49a891adc7c0562fda08b17d60beb1b4f.tar.xz nixpkgs-2a6e4ae49a891adc7c0562fda08b17d60beb1b4f.tar.zst nixpkgs-2a6e4ae49a891adc7c0562fda08b17d60beb1b4f.zip | |
Revert "top-level: Deprecate top-level `{build,host,target}Platform`"
This reverts commit e51f736076548459f36a1250de4bf6867f880b66.
Diffstat (limited to 'pkgs/top-level/stage.nix')
| -rw-r--r-- | pkgs/top-level/stage.nix | 16 |
1 files changed, 5 insertions, 11 deletions
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); |