diff options
| -rw-r--r-- | pkgs/misc/vim-plugins/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index eba479483cd6..aef223da3240 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,5 +1,5 @@ # TODO check that no license information gets lost -{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby +{ fetchurl, stdenv, python, git, go, cmake, vim, vimUtils, perl, ruby , which, fetchgit, llvmPackages, rustPlatform , xkb_switch, rustracerd, fzf, skim , python3, boost, icu, ncurses @@ -7,7 +7,7 @@ , pythonPackages, python3Packages , substituteAll , languagetool -, Cocoa ? null, git +, Cocoa, CoreFoundation, CoreServices }: let @@ -195,6 +195,13 @@ rec { src = LanguageClient-neovim-src; cargoSha256 = "1vafyi650qdaq1f7fc8d4nzrv1i6iz28fs5z66hsnz4xkwb3qq9w"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + + # FIXME: Use impure version of CoreFoundation because of missing symbols. + # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" + ''; }; in buildVimPluginFrom2Nix { name = "LanguageClient-neovim-2018-06-12"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45e62452181e..e04393f6301d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21377,7 +21377,7 @@ with pkgs; vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { }; vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { - inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices; llvmPackages = llvmPackages_39; }); |