neovim-unwrapped: update build inputs for new Darwin SDK (#346946)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, removeReferencesTo, cmake, gettext, msgpack-c, libiconv
|
||||
{ lib, stdenv, fetchFromGitHub, removeReferencesTo, cmake, gettext, msgpack-c, darwin
|
||||
, libuv, lua, pkg-config
|
||||
, unibilium
|
||||
, libvterm-neovim
|
||||
@@ -6,7 +6,6 @@
|
||||
, fetchurl
|
||||
, buildPackages
|
||||
, treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; }
|
||||
, CoreServices
|
||||
, fixDarwinDylibNames
|
||||
, glibcLocales ? null, procps ? null
|
||||
|
||||
@@ -104,7 +103,7 @@ in {
|
||||
neovimLuaEnv
|
||||
tree-sitter
|
||||
unibilium
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices ]
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]
|
||||
++ lib.optionals finalAttrs.finalPackage.doCheck [ glibcLocales procps ]
|
||||
;
|
||||
|
||||
|
||||
@@ -33335,7 +33335,6 @@ with pkgs;
|
||||
wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
|
||||
wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
|
||||
neovim-unwrapped = callPackage ../by-name/ne/neovim-unwrapped/package.nix {
|
||||
CoreServices = darwin.apple_sdk.frameworks.CoreServices;
|
||||
lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user