diff options
author | John Ericson <Ericson2314@yahoo.com> | 2017-08-20 12:06:38 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-20 12:06:38 -0400 |
commit | 5baea8f0eb5dd7ef275bf9711e49830775bff894 (patch) | |
tree | bf1c09500fffe9b15336daa8baa64878653641f6 /pkgs/stdenv/darwin | |
parent | d2e9836aa66378ec846d8d317e21a70709ba93d2 (diff) | |
parent | fbab1d485b60f30af7f2403085c269dfa24b9984 (diff) | |
download | nixlib-5baea8f0eb5dd7ef275bf9711e49830775bff894.tar nixlib-5baea8f0eb5dd7ef275bf9711e49830775bff894.tar.gz nixlib-5baea8f0eb5dd7ef275bf9711e49830775bff894.tar.bz2 nixlib-5baea8f0eb5dd7ef275bf9711e49830775bff894.tar.lz nixlib-5baea8f0eb5dd7ef275bf9711e49830775bff894.tar.xz nixlib-5baea8f0eb5dd7ef275bf9711e49830775bff894.tar.zst nixlib-5baea8f0eb5dd7ef275bf9711e49830775bff894.zip |
Merge pull request #28373 from obsidiansystems/stdenv-extra-inputs
stdenvs: Distinguish between `extraBuildInputs` and `extraNativeBuildInputs`
Diffstat (limited to 'pkgs/stdenv/darwin')
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 74dcf2f009b3..2eeab14b1c79 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -59,11 +59,12 @@ in rec { stageFun = step: last: {shell ? "${bootstrapTools}/bin/bash", overrides ? (self: super: {}), extraPreHook ? "", + extraNativeBuildInputs, extraBuildInputs, allowedRequisites ? null}: let thisStdenv = import ../generic { - inherit config shell extraBuildInputs; + inherit config shell extraNativeBuildInputs extraBuildInputs; allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [ thisStdenv.cc.expand-response-params ]; @@ -162,6 +163,7 @@ in rec { }; + extraNativeBuildInputs = []; extraBuildInputs = []; }; @@ -169,6 +171,7 @@ in rec { stage1 = prevStage: with prevStage; stageFun 1 prevStage { extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; + extraNativeBuildInputs = []; extraBuildInputs = [ pkgs.libcxx ]; allowedRequisites = @@ -195,7 +198,8 @@ in rec { export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; - extraBuildInputs = with pkgs; [ xz darwin.CF libcxx ]; + extraNativeBuildInputs = [ pkgs.xz ]; + extraBuildInputs = with pkgs; [ darwin.CF libcxx ]; allowedRequisites = [ bootstrapTools ] ++ @@ -226,7 +230,8 @@ in rec { # enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first. - extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ]; + extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ]; + extraBuildInputs = with pkgs; [ darwin.CF libcxx ]; extraPreHook = '' export PATH=${pkgs.bash}/bin:$PATH @@ -260,7 +265,8 @@ in rec { stage4 = prevStage: with prevStage; stageFun 4 prevStage { shell = "${pkgs.bash}/bin/bash"; - extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ]; + extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ]; + extraBuildInputs = with pkgs; [ darwin.CF libcxx ]; extraPreHook = '' export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; @@ -321,6 +327,7 @@ in rec { libc = pkgs.darwin.Libsystem; }; + extraNativeBuildInputs = []; extraBuildInputs = with pkgs; [ darwin.CF libcxx ]; extraAttrs = { |