stdenv/darwin: put bash in extraBuildInputs
patch-shebangs should pick these up as they are runtime dependencies. This avoids bootstrap-tools leaking into the outputs.
This commit is contained in:
parent
ec7d72a57d
commit
037f62bbad
@ -280,8 +280,8 @@ in rec {
|
|||||||
# enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
|
# enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
|
||||||
# and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
|
# 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.
|
# patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
|
||||||
extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
|
extraNativeBuildInputs = with pkgs; [ xz ];
|
||||||
extraBuildInputs = [ pkgs.darwin.CF ];
|
extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ];
|
||||||
libcxx = pkgs.libcxx;
|
libcxx = pkgs.libcxx;
|
||||||
|
|
||||||
extraPreHook = ''
|
extraPreHook = ''
|
||||||
@ -338,8 +338,8 @@ in rec {
|
|||||||
};
|
};
|
||||||
in with prevStage; stageFun 4 prevStage {
|
in with prevStage; stageFun 4 prevStage {
|
||||||
shell = "${pkgs.bash}/bin/bash";
|
shell = "${pkgs.bash}/bin/bash";
|
||||||
extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
|
extraNativeBuildInputs = with pkgs; [ xz ];
|
||||||
extraBuildInputs = [ pkgs.darwin.CF ];
|
extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ];
|
||||||
libcxx = pkgs.libcxx;
|
libcxx = pkgs.libcxx;
|
||||||
|
|
||||||
extraPreHook = ''
|
extraPreHook = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user