From 9b409f2caee3fdb228e0573d68710d0f672dbf2b Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Tue, 18 Jun 2013 13:58:48 +1000 Subject: [PATCH] tree: fix compilation on darwin --- pkgs/top-level/all-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 250db466ee95..81ca4ee1ba0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8259,7 +8259,13 @@ let trayer = callPackage ../applications/window-managers/trayer { }; - tree = callPackage ../tools/system/tree { }; + tree = callPackage ../tools/system/tree { + # use gccApple to compile on darwin as the configure script adds a + # -no-cpp-precomp flag, which is not compatible with the default gcc + stdenv = if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenv; + }; tribler = callPackage ../applications/networking/p2p/tribler { };