about summary refs log tree commit diff
path: root/pkgs/stdenv/nix
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@Yahoo.com>2017-05-21 21:37:16 -0400
committerJohn Ericson <Ericson2314@Yahoo.com>2017-05-22 00:25:02 -0400
commit1dc6f15de995da2d0351b34c40215336e219cf82 (patch)
tree65c9b24cc6ff1f1e069db5b25409e0bb0fceed43 /pkgs/stdenv/nix
parentc5c66060484800ecd97a811157a31e9cdd2241b1 (diff)
stdenv: define is* predicates with hostPlatform.is*
This is a saner default until stdenv's are removed altogether
Diffstat (limited to 'pkgs/stdenv/nix')
-rw-r--r--pkgs/stdenv/nix/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index 9aece3ce829d7..ef088ecbf6440 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -24,11 +24,11 @@ bootStages ++ [
 
       initialPath = (import ../common-path.nix) { pkgs = prevStage; };
 
-      system = stdenv.system;
+      inherit (prevStage.stdenv) hostPlatform targetPlatform;
 
       cc = import ../../build-support/cc-wrapper {
         nativeTools = false;
-        nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr";
+        nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr";
         nativeLibc = true;
         inherit stdenv;
         inherit (prevStage) binutils coreutils gnugrep;