From 9c153e2227d3c66c645718355b0ed381f664afa5 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Thu, 6 Aug 2015 13:46:49 -0700 Subject: [PATCH] add binutils to bash build for `size` --- pkgs/shells/bash/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index ea65e1f63c8..60504ecaa9b 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison }: +{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, binutils ? null, bison }: assert interactive -> readline != null; +assert stdenv.isDarwin -> binutils != null; let version = "4.3"; @@ -59,7 +60,8 @@ stdenv.mkDerivation rec { # Note: Bison is needed because the patches above modify parse.y. nativeBuildInputs = [bison] ++ stdenv.lib.optional (texinfo != null) texinfo - ++ stdenv.lib.optional interactive readline; + ++ stdenv.lib.optional interactive readline + ++ stdenv.lib.optional stdenv.isDarwin binutils; # Bash randomly fails to build because of a recursive invocation to # build `version.h'.