From 8a95029e8f654453ed9664c2b78e127b3a49e670 Mon Sep 17 00:00:00 2001 From: Jonathan Conder Date: Sun, 18 Aug 2024 17:36:55 +1200 Subject: [PATCH] neovim-gtk: fix build with rustc 1.80 --- pkgs/by-name/ne/neovim-gtk/collect-box.patch | 12 ++++++++++++ pkgs/by-name/ne/neovim-gtk/package.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/by-name/ne/neovim-gtk/collect-box.patch diff --git a/pkgs/by-name/ne/neovim-gtk/collect-box.patch b/pkgs/by-name/ne/neovim-gtk/collect-box.patch new file mode 100644 index 000000000000..0264637e9bb1 --- /dev/null +++ b/pkgs/by-name/ne/neovim-gtk/collect-box.patch @@ -0,0 +1,12 @@ +diff -ru a/src/ui.rs b/src/ui.rs +--- a/src/ui.rs ++++ b/src/ui.rs +@@ -385,7 +386,7 @@ + files_list + .iter() + .map(|f| misc::escape_filename(f)) +- .collect::>() ++ .collect::>() + .join(" ") + )); + } else { diff --git a/pkgs/by-name/ne/neovim-gtk/package.nix b/pkgs/by-name/ne/neovim-gtk/package.nix index eebb980f85cb..7b8504ebe09a 100644 --- a/pkgs/by-name/ne/neovim-gtk/package.nix +++ b/pkgs/by-name/ne/neovim-gtk/package.nix @@ -26,6 +26,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gdk-pixbuf gtk4 pango vte-gtk4 ]; + patches = [ ./collect-box.patch ]; + postInstall = '' make PREFIX=$out install-resources '';