From 876a05aa448239e421a7c6b4c799fc469fe0200d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Nov 2025 12:41:21 -0600 Subject: [PATCH 1/5] vimPlugins.blink-cmp: fix darwin build Follow the linker args that upstream uses for darwin https://github.com/saghen/blink.cmp/blob/main/.cargo/config.toml Signed-off-by: Austin Horstman --- .../editors/vim/plugins/non-generated/blink-cmp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix index b14b26f9290a..62309d6d727d 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix @@ -26,6 +26,8 @@ let env = { # TODO: remove this if plugin stops using nightly rust RUSTC_BOOTSTRAP = true; + # Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime + RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup"; }; }; in From f3384f38c8a8317652f25e53aba54242b273d0c8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Nov 2025 12:43:20 -0600 Subject: [PATCH 2/5] vimPlugins.avante-nvim: fix darwin build Signed-off-by: Austin Horstman --- .../editors/vim/plugins/non-generated/avante-nvim/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index 124f49cfd93c..b967afe3b921 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -37,6 +37,9 @@ let buildFeatures = [ "luajit" ]; + # Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime + env.RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup"; + checkFlags = [ # Disabled because they access the network. "--skip=test_hf" From 2cf7612f1fe7ba042585d2151acc8c78e889aa95 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Nov 2025 12:45:39 -0600 Subject: [PATCH 3/5] vimPlugins.fff-nvim: fix darwin build Signed-off-by: Austin Horstman --- .../vim/plugins/non-generated/fff-nvim/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix index 8f2f04b5ce86..4c92849f07f6 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix @@ -2,11 +2,12 @@ lib, fetchFromGitHub, rustPlatform, - pkg-config, - perl, - openssl, - vimUtils, nix-update-script, + openssl, + perl, + pkg-config, + stdenv, + vimUtils, }: let version = "65aeacf-unstable-2025-11-03"; @@ -35,6 +36,9 @@ let RUSTC_BOOTSTRAP = 1; # We need rust unstable features OPENSSL_NO_VENDOR = true; + + # Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime + RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup"; }; }; in From 6b853a18f976559d226abfe5b3ac3c0b1dbab483 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Nov 2025 12:48:34 -0600 Subject: [PATCH 4/5] vimPlugins.codesnap-nvim: fix darwin build Signed-off-by: Austin Horstman --- .../vim/plugins/non-generated/codesnap-nvim/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix index cfe63d8b891c..0388ace01723 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix @@ -29,6 +29,9 @@ let rustPlatform.bindgenHook ]; + # Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime + env.RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup"; + buildInputs = [ libuv.dev ]; From 9751f38f82c672b0596f86edd233ba50f26a5d12 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Nov 2025 12:51:02 -0600 Subject: [PATCH 5/5] vimPlugins.blink-pairs: fix darwin build Signed-off-by: Austin Horstman --- .../vim/plugins/non-generated/blink-pairs/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix index 52ac17aaf698..43a2bbc54c0b 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix @@ -23,7 +23,12 @@ let cargoHash = "sha256-Cn9zRsQkBwaKbBD/JEpFMBOF6CBZTDx7fQa6Aoic4YU="; - env.RUSTC_BOOTSTRAP = 1; + env = { + RUSTC_BOOTSTRAP = 1; + + # Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime + RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup"; + }; # NOTE: Disabled upstream too doCheck = false;