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
@@ -86,6 +86,8 @@ stdenv.mkDerivation rec {

  installFlags = stdenv.lib.optionalString docSupport "install-doc";

+  CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.7";
+
  postInstall = ''
    # Bundler tries to create this directory
    mkdir -pv $out/${passthru.gemPath}