From 0828e2d8c369604c56219bd7085256b984087280 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 20 Aug 2018 14:43:41 -0400 Subject: treewide: Remove usage of remaining redundant platform compatability stuff Want to get this out of here for 18.09, so it can be deprecated thereafter. --- pkgs/stdenv/cross/default.nix | 5 +++-- pkgs/stdenv/darwin/default.nix | 4 ++-- pkgs/stdenv/linux/default.nix | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs/stdenv') diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index bc8d772530a11..31ca9f2c82e4f 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -23,8 +23,9 @@ in lib.init bootStages ++ [ inherit config overlays; selfBuild = false; stdenv = - assert vanillaPackages.hostPlatform == localSystem; - assert vanillaPackages.targetPlatform == localSystem; + assert vanillaPackages.stdenv.buildPlatform == localSystem; + assert vanillaPackages.stdenv.hostPlatform == localSystem; + assert vanillaPackages.stdenv.targetPlatform == localSystem; vanillaPackages.stdenv.override { targetPlatform = crossSystem; }; # It's OK to change the built-time dependencies allowCustomOverrides = true; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 22dd700b2dda5..cda643c42fe3f 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -348,10 +348,10 @@ in rec { darwin = super.darwin // { inherit (darwin) dyld ICU Libsystem libiconv; - } // lib.optionalAttrs (super.targetPlatform == localSystem) { + } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { inherit (darwin) binutils binutils-unwrapped cctools; }; - } // lib.optionalAttrs (super.targetPlatform == localSystem) { + } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. inherit binutils binutils-unwrapped; }; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index c7fc2ebac35b7..de58178a34ba7 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -366,7 +366,7 @@ in gnumake gnused gnutar gnugrep gnupatch patchelf attr acl paxctl zlib pcre; ${localSystem.libc} = getLibc prevStage; - } // lib.optionalAttrs (super.targetPlatform == localSystem) { + } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. inherit (prevStage) binutils binutils-unwrapped; gcc = cc; -- cgit 1.4.1