From 8af33279771ebac5a490d9012666e3934081f6cf Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Fri, 7 Jun 2024 07:20:00 -0700 Subject: [PATCH] vim: fix build on FreeBSD cross --- pkgs/applications/editors/vim/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index d04fa241ba73..b9c5f4ff7bbc 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -26,18 +26,22 @@ stdenv.mkDerivation { configureFlags = [ "--enable-multibyte" "--enable-nls" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([ "vim_cv_toupper_broken=no" "--with-tlib=ncurses" "vim_cv_terminfo=yes" "vim_cv_tgetent=zero" # it does on native anyway - "vim_cv_timer_create=yes" "vim_cv_tty_group=tty" "vim_cv_tty_mode=0660" "vim_cv_getcwd_broken=no" "vim_cv_stat_ignores_slash=yes" "vim_cv_memmove_handles_overlap=yes" - ]; + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ + "vim_cv_timer_create=no" + "vim_cv_timer_create_with_lrt=yes" + ] ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ + "vim_cv_timer_create=yes" + ]); # which.sh is used to for vim's own shebang patching, so make it find # binaries for the host platform.