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

Conflicts:
	pkgs/applications/editors/vim/macvim.nix
This commit is contained in:
Eelco Dolstra
2014-11-04 14:30:43 +01:00
93 changed files with 1019 additions and 1035 deletions
@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
# Miniperl needs -lm. perl needs -lrt.
configureFlags =
[ "-de"
"-Dcc=gcc"
"-Uinstallusrbinperl"
"-Dinstallstyle=lib/perl5"
"-Duseshrplib"