From 25fafd2eb5599c6d61357964f9802c260c81556a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 14 Nov 2018 19:32:54 +0100 Subject: [PATCH] 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. --- pkgs/stdenv/darwin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index d9b3c7dd29f..5fb410b64eb 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 = ''