From d9c118dd42f8b76323ea9ccdf38976eee157b55d Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 17 Nov 2023 17:53:37 -0500 Subject: [PATCH] helix: fix build with clang 16 Fix an implicit int error in one of the tree-sitter grammars. --- pkgs/applications/editors/helix/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index 7d3b964fb15c..323218f9437b 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -12,6 +12,17 @@ rustPlatform.buildRustPackage rec { stripRoot = false; }; + patches = [ + # Fixes implicit int error in rescript grammar when building with clang 16. + # https://github.com/nkrkv/tree-sitter-rescript/pull/227. + (fetchpatch { + url = "https://github.com/nkrkv/tree-sitter-rescript/commit/ea93cbf7d9c52f925ed296b4714737e8088f3a19.patch"; + hash = "sha256-gpGPiy+yEs+dMJEnE5O3WC7iSB/6PLJYBYRcdTx//+o="; + extraPrefix = "runtime/grammars/sources/rescript/"; + stripLen = 1; + }) + ]; + cargoHash = "sha256-B8RO6BADDbPchowSfNVgviGvVgH23iF42DdhEBKBQzs="; nativeBuildInputs = [ git installShellFiles makeWrapper ];