alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

LanguageClient-neovim: fix darwin build

Browse source
This commit is contained in:
Daiderd Jordan 2018-06-16 13:33:10 +02:00
parent 70214715ba
commit 669199a725
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/misc/vim-plugins/default.nix
View file

@ -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";

2
pkgs/top-level/all-packages.nix
View file

@ -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;
});