From d9838753622a230ff6a0957993deba1e7ffecfc5 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 10 May 2015 18:06:29 -0700 Subject: [PATCH] gcc-5: Fix build on darwin --- pkgs/development/compilers/gcc/5/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 1c61d57729df..7096467854c7 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -33,6 +33,7 @@ , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true , gnused ? null +, binutils ? null }: assert langJava -> zip != null && unzip != null @@ -47,6 +48,9 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert stdenv.isDarwin -> gnused != null; +# Need c++filt on darwin +assert stdenv.isDarwin -> binutils != null; + # The go frontend is written in c++ assert langGo -> langCC; @@ -285,6 +289,7 @@ stdenv.mkDerivation ({ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. ++ (optional stdenv.isDarwin gnused) + ++ (optional stdenv.isDarwin binutils) ; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl";