diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-09 18:07:00 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-09 18:07:52 +0200 |
commit | bfb7ef86f3f2417b6866c704b7423c33bc33286c (patch) | |
tree | c466dc1a8c5e41bc2be1b349ac93ed4fd5a5a0d2 /pkgs/stdenv/linux/default.nix | |
parent | d10c3cc5eedf58e80e270d7c912cf68ea1a822e4 (diff) | |
parent | 466e7e23c6f71ebed7050802d377102002fc2a0d (diff) | |
download | nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.tar nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.tar.gz nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.tar.bz2 nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.tar.lz nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.tar.xz nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.tar.zst nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.zip |
Merge branch 'master' into staging
Mass rebuilds incoming. The mass-rebuild situation got really messy this weekend.
Diffstat (limited to 'pkgs/stdenv/linux/default.nix')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index c2879d93e17c..c475d2d1e927 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -52,8 +52,11 @@ let let thisStdenv = import ../generic { - inherit config extraBuildInputs; name = "stdenv-linux-boot"; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config extraBuildInputs; preHook = '' # Don't patch #!/interpreter because it leads to retained @@ -64,9 +67,6 @@ let shell = "${bootstrapTools}/bin/bash"; initialPath = [bootstrapTools]; - hostPlatform = localSystem; - targetPlatform = localSystem; - fetchurlBoot = import ../../build-support/fetchurl/boot.nix { inherit system; }; @@ -102,9 +102,6 @@ let }; in { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = thisStdenv; }; @@ -269,11 +266,11 @@ in # dependency (`nix-store -qR') on bootstrapTools or the first # binutils built. (prevStage: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = import ../generic rec { + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; inherit config; preHook = '' @@ -286,9 +283,6 @@ 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; |