Fix MacVim by using clang.

This commit is contained in:
Charles Strahan
2014-10-18 01:15:45 -04:00
parent 1a7c1615bf
commit bad51b0b02
3 changed files with 41 additions and 6 deletions
+7 -5
View File
@@ -1,17 +1,16 @@
{ stdenv, stdenvAdapters, gccApple, fetchFromGitHub, ncurses, gettext,
{ stdenv, fetchFromGitHub, ncurses, gettext,
pkgconfig, cscope, python, ruby, tcl, perl, luajit
}:
let inherit (stdenvAdapters.overrideGCC stdenv gccApple) mkDerivation;
in mkDerivation rec {
stdenv.mkDerivation rec {
name = "macvim-${version}";
version = "7.4.355";
version = "7.4.479";
src = fetchFromGitHub {
owner = "genoma";
repo = "macvim";
rev = "c18a61f9723565664ffc2eda9179e96c95860e25";
rev = "f9c084b97fa9d5cad2448dfd3eff3d9b7f0fac59";
sha256 = "190bngg8m4bwqcia7w24gn7mmqkhk0mavxy81ziwysam1f652ymf";
};
@@ -46,6 +45,7 @@ in mkDerivation rec {
"--enable-perlinterp=dynamic"
"--enable-rubyinterp=dynamic"
"--enable-tclinterp=yes"
"--without-local-dir"
"--with-luajit"
"--with-lua-prefix=${luajit}"
"--with-ruby-command=${ruby}/bin/ruby"
@@ -54,6 +54,8 @@ in mkDerivation rec {
"--with-compiledby=Nix"
];
makeFlags = ''PREFIX=$(out) CPPFLAGS="-Wno-error"'';
preConfigure = ''
DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer
configureFlagsArray+=(