Skip to content

Commit

Permalink
neovim-unwrapped: update build inputs for new Darwin SDK
Browse files Browse the repository at this point in the history
The Darwin SDK in nixpkgs no longer provides libutil by default due to
possible confusion when packages (such as Python) detect `libutil.h` and
assume a different platform. Neovim requires it, so include it
explicitly on Darwin.
  • Loading branch information
reckenrode committed Oct 10, 2024
1 parent e694240 commit bed5515
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
5 changes: 2 additions & 3 deletions pkgs/by-name/ne/neovim-unwrapped/package.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{ 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
, tree-sitter
, fetchurl
, buildPackages
, treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; }
, CoreServices
, fixDarwinDylibNames
, glibcLocales ? null, procps ? null

Expand Down Expand Up @@ -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 ]
;

Expand Down
1 change: 0 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33263,7 +33263,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;
};

Expand Down

0 comments on commit bed5515

Please sign in to comment.