diff options
author | Jude Taylor <me@jude.bio> | 2015-10-19 16:46:23 -0700 |
---|---|---|
committer | Jude Taylor <me@jude.bio> | 2015-10-19 16:46:23 -0700 |
commit | 97ebba6f1a7151a7a5b7b020e2d5f83f6fce0d93 (patch) | |
tree | 9c6c56a53339260183807a5113d8a6ef02a3df9d /pkgs/applications/editors/vim/configurable.nix | |
parent | f77bf46c1e705934a00c52d90cc62a76fbb1f6b5 (diff) | |
download | nixlib-97ebba6f1a7151a7a5b7b020e2d5f83f6fce0d93.tar nixlib-97ebba6f1a7151a7a5b7b020e2d5f83f6fce0d93.tar.gz nixlib-97ebba6f1a7151a7a5b7b020e2d5f83f6fce0d93.tar.bz2 nixlib-97ebba6f1a7151a7a5b7b020e2d5f83f6fce0d93.tar.lz nixlib-97ebba6f1a7151a7a5b7b020e2d5f83f6fce0d93.tar.xz nixlib-97ebba6f1a7151a7a5b7b020e2d5f83f6fce0d93.tar.zst nixlib-97ebba6f1a7151a7a5b7b020e2d5f83f6fce0d93.zip |
add vim-vanilla changes to vim_configurable
Diffstat (limited to 'pkgs/applications/editors/vim/configurable.nix')
-rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index fd4f13ab6500..3d6c9ffa859f 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. |