diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-11-14 19:32:54 +0100 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-11-14 23:37:28 +0100 |
commit | 25fafd2eb5599c6d61357964f9802c260c81556a (patch) | |
tree | 9b9501f5ef9f093ead02c0ef68ce79937585f575 /pkgs/stdenv | |
parent | 64c4cc3706ff5de511c16d7cbdf3adde39ccdbd4 (diff) | |
download | nixlib-25fafd2eb5599c6d61357964f9802c260c81556a.tar nixlib-25fafd2eb5599c6d61357964f9802c260c81556a.tar.gz nixlib-25fafd2eb5599c6d61357964f9802c260c81556a.tar.bz2 nixlib-25fafd2eb5599c6d61357964f9802c260c81556a.tar.lz nixlib-25fafd2eb5599c6d61357964f9802c260c81556a.tar.xz nixlib-25fafd2eb5599c6d61357964f9802c260c81556a.tar.zst nixlib-25fafd2eb5599c6d61357964f9802c260c81556a.zip |
Revert "darwin/stdenv: bash is a build input"
Completely breaks darwin. Every package in the stdenv that has shebangs in the output will end up with references to bootstrap-tools. This reverts commit 2f2e635dd5431859a01bbbcae0493be90041d495.
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 d9b3c7dd29f0..5fb410b64ebd 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 ]; - extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ]; + extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ]; + extraBuildInputs = [ pkgs.darwin.CF ]; 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 ]; - extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ]; + extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ]; + extraBuildInputs = [ pkgs.darwin.CF ]; libcxx = pkgs.libcxx; extraPreHook = '' |