Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging

Conflicts: pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
parent ed867a50eb 899d81b37b
commit 7495c61d49
93 changed files with 1019 additions and 1035 deletions
--- a/pkgs/tools/misc/getopt/default.nix
+++ b/pkgs/tools/misc/getopt/default.nix
@@ -7,4 +7,7 @@ stdenv.mkDerivation {
    url = http://tarballs.nixos.org/getopt-1.1.4.tar.gz;
    sha256 = "1arvjfzw6p310zbgv629w5hkyslrj44imf3r3s2r4ry2jfcks221";
  };
+  preBuild = ''
+    export buildFlags=CC="$CC" # for darwin
+  '';
 }