add vim-vanilla changes to vim_configurable

Changed files
+17 -2
pkgs
applications
editors
top-level
+14 -2
pkgs/applications/editors/vim/configurable.nix
··· 3 3 args@{pkgs, source ? "default", fetchurl, fetchhg, stdenv, ncurses, pkgconfig, gettext 4 4 , composableDerivation, lib, config, glib, gtk, python, perl, tcl, ruby 5 5 , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu 6 - , libICE, ... }: with args; 6 + , libICE 7 + 8 + # apple frameworks 9 + , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private 10 + 11 + , ... }: with args; 7 12 8 13 9 14 let inherit (args.composableDerivation) composableDerivation edf; ··· 88 93 ''; 89 94 }; 90 95 } 91 - // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support. 96 + // edf { 97 + name = "darwin"; 98 + enable = { 99 + nativeBuildInputs = [ CoreServices CoreData Cocoa Foundation libobjc cf-private ]; 100 + NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin 101 + "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; 102 + }; 103 + } #Disable Darwin (Mac OS X) support. 92 104 // edf { name = "xsmp"; } #Disable XSMP session management 93 105 // edf { name = "xsmp_interact"; } #Disable XSMP interaction 94 106 // edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter.
+3
pkgs/top-level/all-packages.nix
··· 13091 13091 vimHugeX = vim_configurable; 13092 13092 13093 13093 vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { 13094 + inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; 13095 + inherit (darwin) libobjc cf-private; 13096 + 13094 13097 features = "huge"; # one of tiny, small, normal, big or huge 13095 13098 lua = pkgs.lua5_1; 13096 13099 gui = config.vim.gui or "auto";