diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 5e1d9dc9cb8b..01561f4c2722 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -93,6 +93,16 @@ in stdenv.mkDerivation rec { "--disable-nextaf_check" "--disable-carbon_check" "--disable-gtktest" + ] ++ 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_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.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}" ++ lib.optional stdenv.isDarwin diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 2cda81c2588a..d8167f609879 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation { "vim_cv_tty_mode=0660" "vim_cv_getcwd_broken=no" "vim_cv_stat_ignores_slash=yes" - "ac_cv_sizeof_int=4" - "vim_cv_memmove_handles_overlap=yes" "vim_cv_memmove_handles_overlap=yes" ]; diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/misc/vim-plugins/build-vim-plugin.nix index 5b235188c06a..3d36edb32325 100644 --- a/pkgs/misc/vim-plugins/build-vim-plugin.nix +++ b/pkgs/misc/vim-plugins/build-vim-plugin.nix @@ -29,7 +29,8 @@ rec { # dont move the doc folder since vim expects it forceShare= [ "man" "info" ]; - nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ vimGenDocHook ]; + nativeBuildInputs = attrs.nativeBuildInputs or [] + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) vimGenDocHook; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; installPhase = ''