From f7e2353e0b03be01b22fb1c01d75a459580eed6c Mon Sep 17 00:00:00 2001 From: Tae Selene Sandoval Murgan Date: Sun, 22 May 2022 09:16:22 +0200 Subject: [PATCH] neovim: Pass CoreServices when building on darwin --- pkgs/applications/editors/neovim/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index b4858b21eee..cd046b1871f 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.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 ] ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b6fcf7046c..1906f274ef5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30269,6 +30269,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; };