diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-21 18:42:57 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-21 18:42:57 -0400 |
commit | 0135e61b4c59357e01e0fda713e95402ea3a443c (patch) | |
tree | daf7de4554407d52a44c94814d216dc3f16beb9a /pkgs/stdenv | |
parent | 221f5f00e30870dc4f1ea06e78b5e27b30ec9b16 (diff) | |
parent | c03571107213331494fb5330fd2bb4129d19cdbc (diff) | |
download | nixpkgs-0135e61b4c59357e01e0fda713e95402ea3a443c.tar nixpkgs-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.gz nixpkgs-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.bz2 nixpkgs-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.lz nixpkgs-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.xz nixpkgs-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.zst nixpkgs-0135e61b4c59357e01e0fda713e95402ea3a443c.zip |
Merge remote-tracking branch 'upstream/master' into staging
That way the tarball job succeeds
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 6 | ||||
-rw-r--r-- | pkgs/stdenv/freebsd/default.nix | 14 | ||||
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 | ||||
-rw-r--r-- | pkgs/stdenv/nix/default.nix | 8 |
4 files changed, 6 insertions, 26 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index d5d156137f2..61b7df19543 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -78,7 +78,6 @@ in rec { cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { inherit shell; inherit (last) stdenv; - inherit (last.pkgs.darwin) dyld; nativeTools = true; nativePrefix = bootstrapTools; @@ -86,8 +85,6 @@ in rec { buildPackages = lib.optionalAttrs (last ? stdenv) { inherit (last) stdenv; }; - hostPlatform = localSystem; - targetPlatform = localSystem; libc = last.pkgs.darwin.Libsystem; isClang = true; cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; @@ -320,10 +317,7 @@ in rec { buildPackages = { inherit (prevStage) stdenv; }; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit (pkgs) coreutils binutils gnugrep; - inherit (pkgs.darwin) dyld; cc = pkgs.llvmPackages.clang-unwrapped; libc = pkgs.darwin.Libsystem; }; diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index d15afe76189..c10d1515a3d 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -40,8 +40,6 @@ let inherit (localSystem) system; in targetPlatform = localSystem; inherit config; initialPath = [ "/" "/usr" ]; - hostPlatform = localSystem; - targetPlatform = localSystem; shell = "${bootstrapTools}/bin/bash"; fetchurlBoot = null; cc = null; @@ -55,13 +53,11 @@ let inherit (localSystem) system; in stdenv = import ../generic { name = "stdenv-freebsd-boot-0"; - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config; initialPath = [ prevStage.bootstrapTools ]; inherit (prevStage.stdenv) - hostPlatform targetPlatform shell; + buildPlatform hostPlatform targetPlatform + shell; fetchurlBoot = prevStage.fetchurl; cc = null; }; @@ -71,13 +67,11 @@ let inherit (localSystem) system; in inherit config overlays; stdenv = import ../generic { name = "stdenv-freebsd-boot-3"; - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config; inherit (prevStage.stdenv) - hostPlatform targetPlatform initialPath shell fetchurlBoot; + buildPlatform hostPlatform targetPlatform + initialPath shell fetchurlBoot; cc = import ../../build-support/cc-wrapper { nativeTools = true; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 0167e51f2fd..5c03d83d5f7 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -79,8 +79,6 @@ let buildPackages = lib.optionalAttrs (prevStage ? stdenv) { inherit (prevStage) stdenv; }; - hostPlatform = localSystem; - targetPlatform = localSystem; cc = prevStage.gcc-unwrapped; isGNU = true; libc = prevStage.glibc; @@ -244,8 +242,6 @@ in buildPackages = { inherit (prevStage) stdenv; }; - hostPlatform = localSystem; - targetPlatform = localSystem; cc = prevStage.gcc-unwrapped; libc = self.glibc; inherit (self) stdenv binutils coreutils gnugrep; diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index aaf6c523ea4..c736442dc0a 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -13,12 +13,10 @@ bootStages ++ [ inherit config overlays; stdenv = import ../generic rec { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; - inherit config; + inherit (prevStage.stdenv) buildPlatform hostPlatform targetPlatform; + preHook = '' export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}" @@ -27,8 +25,6 @@ bootStages ++ [ initialPath = (import ../common-path.nix) { pkgs = prevStage; }; - inherit (prevStage.stdenv) hostPlatform targetPlatform; - cc = import ../../build-support/cc-wrapper { nativeTools = false; nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr"; |