add vim-vanilla changes to vim_configurable

Changed files
+17 -2
pkgs
applications
editors
top-level
+14 -2
pkgs/applications/editors/vim/configurable.nix
···
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;
···
'';
};
}
-
// 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.
+3
pkgs/top-level/all-packages.nix
···
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";