diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-10-31 15:35:34 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-02 00:27:14 -0500 |
commit | 2f2e635dd5431859a01bbbcae0493be90041d495 (patch) | |
tree | 107328736f91b84a1d78f1b88b39cfc71e6beeb2 /pkgs/stdenv | |
parent | eb7c50a993833ecdb94cc3affb55ac4c560edf50 (diff) | |
download | nixlib-2f2e635dd5431859a01bbbcae0493be90041d495.tar nixlib-2f2e635dd5431859a01bbbcae0493be90041d495.tar.gz nixlib-2f2e635dd5431859a01bbbcae0493be90041d495.tar.bz2 nixlib-2f2e635dd5431859a01bbbcae0493be90041d495.tar.lz nixlib-2f2e635dd5431859a01bbbcae0493be90041d495.tar.xz nixlib-2f2e635dd5431859a01bbbcae0493be90041d495.tar.zst nixlib-2f2e635dd5431859a01bbbcae0493be90041d495.zip |
darwin/stdenv: bash is a build input
patch shebangs needs to be in build inputs for it to get into HOST_PATH.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 5fb410b64ebd..d9b3c7dd29f0 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -278,8 +278,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. - extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ]; - extraBuildInputs = [ pkgs.darwin.CF ]; + extraNativeBuildInputs = with pkgs; [ xz ]; + extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ]; libcxx = pkgs.libcxx; extraPreHook = '' @@ -335,8 +335,8 @@ in rec { }; in with prevStage; stageFun 4 prevStage { shell = "${pkgs.bash}/bin/bash"; - extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ]; - extraBuildInputs = [ pkgs.darwin.CF ]; + extraNativeBuildInputs = with pkgs; [ xz ]; + extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ]; libcxx = pkgs.libcxx; extraPreHook = '' |