Unverified Commit f8bb36dd authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

vimPlugins.{avante-nvim,blink-cmp, blink-pairs, codesnap-nvim, fff-nvim}: fix...

vimPlugins.{avante-nvim,blink-cmp, blink-pairs, codesnap-nvim, fff-nvim}: fix darwin build (#464350)
parents b0b53ded 9751f38f
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -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"
+2 −0
Original line number Diff line number Diff line
@@ -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
+6 −1
Original line number Diff line number Diff line
@@ -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;
+3 −0
Original line number Diff line number Diff line
@@ -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
    ];
+7 −3
Original line number Diff line number Diff line
@@ -2,11 +2,12 @@
  lib,
  fetchFromGitHub,
  rustPlatform,
  pkg-config,
  perl,
  nix-update-script,
  openssl,
  perl,
  pkg-config,
  stdenv,
  vimUtils,
  nix-update-script,
}:
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