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/linux | |
| 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/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 3a244675b3a4..b3399cc29b34 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -52,7 +52,7 @@ let let thisStdenv = import ../generic { - inherit system config extraBuildInputs; + inherit config extraBuildInputs; name = "stdenv-linux-boot"; preHook = '' @@ -64,6 +64,9 @@ let shell = "${bootstrapTools}/bin/bash"; initialPath = [bootstrapTools]; + hostPlatform = localSystem; + targetPlatform = localSystem; + fetchurlBoot = import ../../build-support/fetchurl/boot.nix { inherit system; }; @@ -261,7 +264,7 @@ in targetPlatform = localSystem; inherit config overlays; stdenv = import ../generic rec { - inherit system config; + inherit config; preHook = '' # Make "strip" produce deterministic output, by setting @@ -273,6 +276,9 @@ in initialPath = ((import ../common-path.nix) {pkgs = prevStage;}); + hostPlatform = localSystem; + targetPlatform = localSystem; + extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; |