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

neovim: Pass CoreServices when building on darwin
main
Artturi 2 years ago committed by GitHub
commit 3efe7235dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      pkgs/applications/editors/neovim/default.nix
  2. 1
      pkgs/top-level/all-packages.nix

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

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

Loading…
Cancel
Save