add vim-vanilla changes to vim_configurable

This commit is contained in:
Jude Taylor 2015-10-19 16:46:23 -07:00
parent f77bf46c1e
commit 97ebba6f1a
2 changed files with 17 additions and 2 deletions

View file

@ -3,7 +3,12 @@
args@{pkgs, source ? "default", fetchurl, fetchhg, stdenv, ncurses, pkgconfig, gettext
, composableDerivation, lib, config, glib, gtk, python, perl, tcl, ruby
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
, libICE, ... }: with args;
, libICE
# apple frameworks
, CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private
, ... }: with args;
let inherit (args.composableDerivation) composableDerivation edf;
@ -88,7 +93,14 @@ composableDerivation {
'';
};
}
// edf { name = "darwin"; } #Disable Darwin (Mac OS X) support.
// edf {
name = "darwin";
enable = {
nativeBuildInputs = [ CoreServices CoreData Cocoa Foundation libobjc cf-private ];
NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
"/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
};
} #Disable Darwin (Mac OS X) support.
// edf { name = "xsmp"; } #Disable XSMP session management
// edf { name = "xsmp_interact"; } #Disable XSMP interaction
// edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter.

View file

@ -13091,6 +13091,9 @@ let
vimHugeX = vim_configurable;
vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
inherit (darwin) libobjc cf-private;
features = "huge"; # one of tiny, small, normal, big or huge
lua = pkgs.lua5_1;
gui = config.vim.gui or "auto";