fix: fix support for grammar overlays and include predicate (#13603) (#13613)

pull/12173/head
Zhaith Izaliel 2025-05-26 15:47:14 +02:00 committed by GitHub
parent 8d58f6ce8d
commit 12523cd126
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions

View File

@ -6,6 +6,8 @@
installShellFiles, installShellFiles,
git, git,
gitRev ? null, gitRev ? null,
grammarOverlays ? [],
includeGrammarIf ? _: true,
}: let }: let
fs = lib.fileset; fs = lib.fileset;
@ -27,7 +29,7 @@
# that they reside in. It is built by calling the derivation in the # that they reside in. It is built by calling the derivation in the
# grammars.nix file, then taking the runtime directory in the git repo # grammars.nix file, then taking the runtime directory in the git repo
# and hooking symlinks up to it. # and hooking symlinks up to it.
grammars = callPackage ./grammars.nix {}; grammars = callPackage ./grammars.nix {inherit grammarOverlays includeGrammarIf;};
runtimeDir = runCommand "helix-runtime" {} '' runtimeDir = runCommand "helix-runtime" {} ''
mkdir -p $out mkdir -p $out
ln -s ${./runtime}/* $out ln -s ${./runtime}/* $out