From 352dded9893a4dd3af1dffce7765a9c87e9a80dd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 8 Apr 2011 13:03:53 +0000 Subject: [PATCH] Libelf isn't building on Darwin according to hydra, so remove libelf-dependent GCC-4.6 from Darwin svn path=/nixpkgs/trunk/; revision=26753 --- pkgs/development/compilers/gcc-4.6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index 0d8f534e286..631207001fa 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -401,7 +401,7 @@ stdenv.mkDerivation ({ # Volunteers needed for the {Cyg,Dar}win ports of *PPL. # gnatboot is not available out of linux platforms, so we disable the darwin build # for the gnat (ada compiler). - platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ]; + platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false && libelf == null) [ "i686-darwin" ]; }; }