From bed551533cef8e811bf40858fad45597e8f1c685 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 19 Sep 2024 22:09:56 -0400 Subject: [PATCH] neovim-unwrapped: update build inputs for new Darwin SDK 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. --- pkgs/by-name/ne/neovim-unwrapped/package.nix | 5 ++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 886444b9442f..cec84b5d60f7 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -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 ] ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6744b93ea24..54c78257eda2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; };