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

Merge pull request #173918 from tssm/neovim-darwin-coreservices

Browse source 
neovim: Pass CoreServices when building on darwin
This commit is contained in:
Artturi 2022-05-22 14:15:21 +03:00 committed by GitHub
parent 821724b184 f7e2353e0b
commit 3efe7235dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/editors/neovim/default.nix
View file

@ -3,6 +3,7 @@
, unibilium, gperf
, libvterm-neovim
, tree-sitter
, CoreServices
, glibcLocales ? null, procps ? null
# now defaults to false because some tests can be flaky (clipboard etc), see
@ -60,7 +61,7 @@ in
neovimLuaEnv
tree-sitter
unibilium
] ++ optional stdenv.isDarwin libiconv
] ++ optionals stdenv.isDarwin [ libiconv CoreServices ]
++ optionals doCheck [ glibcLocales procps ]
;

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

@ -30279,6 +30279,7 @@ with pkgs;
wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
neovim-unwrapped = callPackage ../applications/editors/neovim {
CoreServices = darwin.apple_sdk.frameworks.CoreServices;
lua = luajit;
};