Merge pull request #249414 from atalii/cherry-pick-helix-ub-fix

NixOS · Oct 5, 2023 · 1e9c7c0 · 1e9c7c0
2 parents 675652d + 6a9cb4f
commit 1e9c7c0
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, rustPlatform, installShellFiles, makeWrapper, callPackage }:
+{ fetchFromGitHub, fetchpatch, lib, rustPlatform, installShellFiles, makeWrapper, callPackage }:
 
 let
   version = "23.05";
@@ -13,13 +13,18 @@ let
   grammars = callPackage ./grammars.nix { };
 in rustPlatform.buildRustPackage {
   inherit src version;
-
   pname = "helix";
   # This release tarball includes source code for the tree-sitter grammars,
   # which is not ordinarily part of the repository.
   cargoSha256 = "sha256-/LCtfyDAA2JuioBD/CDMv6OOxM0B9A3PpuVP/YY5oF0=";
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];
+  patches = [
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/helix-editor/helix/pull/7227.patch";
+      hash = "sha256-dObMKHNJfc5TODUjZ28TVxuTen02rl8HzcXpFWnhB1k=";
+    })
+  ];
 
   postInstall = ''
     # We self build the grammar files