diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2017-05-21 21:37:16 -0400 |
---|---|---|
committer | John Ericson <Ericson2314@Yahoo.com> | 2017-05-22 00:25:02 -0400 |
commit | 1dc6f15de995da2d0351b34c40215336e219cf82 (patch) | |
tree | 65c9b24cc6ff1f1e069db5b25409e0bb0fceed43 /pkgs/stdenv/nix | |
parent | c5c66060484800ecd97a811157a31e9cdd2241b1 (diff) | |
download | nixlib-1dc6f15de995da2d0351b34c40215336e219cf82.tar nixlib-1dc6f15de995da2d0351b34c40215336e219cf82.tar.gz nixlib-1dc6f15de995da2d0351b34c40215336e219cf82.tar.bz2 nixlib-1dc6f15de995da2d0351b34c40215336e219cf82.tar.lz nixlib-1dc6f15de995da2d0351b34c40215336e219cf82.tar.xz nixlib-1dc6f15de995da2d0351b34c40215336e219cf82.tar.zst nixlib-1dc6f15de995da2d0351b34c40215336e219cf82.zip |
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.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 9aece3ce829d..ef088ecbf644 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; |