dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

neovim-unwrapped: update build inputs for new Darwin SDK

Browse Source 
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.
This commit is contained in:
Randy Eckenrode 2024-09-19 22:09:56 -04:00
parent e694240f77
commit bed551533c
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/by-name/ne/neovim-unwrapped/package.nix
View File

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

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

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