From 97ebba6f1a7151a7a5b7b020e2d5f83f6fce0d93 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Mon, 19 Oct 2015 16:46:23 -0700 Subject: [PATCH] add vim-vanilla changes to vim_configurable --- pkgs/applications/editors/vim/configurable.nix | 16 ++++++++++++++-- pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index fd4f13ab650..3d6c9ffa859 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -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. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f268a8e59df..3bc1100639e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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";