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
@@ -37,6 +37,7 @@ stdenv.mkDerivation {
      prefix=$out
      MANDIR=$out/share/man/man1
      ${systemFlags}
+      CC="$CC"
    )
  '';