diff options
Diffstat (limited to 'pkgs/development/tools/parsing/tree-sitter/default.nix')
| -rw-r--r-- | pkgs/development/tools/parsing/tree-sitter/default.nix | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index b60d48a6430a..c3bdca43f36a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -8,6 +8,8 @@ which, rustPlatform, emscripten, + openssl, + pkg-config, callPackage, linkFarm, substitute, @@ -28,8 +30,8 @@ let # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) Set NIXPKGS_GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions) # 4) run the ./result script that is output by that (it updates ./grammars) - version = "0.25.1"; - hash = "sha256-xnUhiIeRxD4ZKMUQ6pNEetDqiFqiJsa57BRM2zqNFro="; + version = "0.25.3"; + hash = "sha256-xafeni6Z6QgPiKzvhCT2SyfPn0agLHo47y+6ExQXkzE="; src = fetchFromGitHub { owner = "tree-sitter"; @@ -171,10 +173,19 @@ rustPlatform.buildRustPackage { inherit src version; useFetchCargoVendor = true; - cargoHash = "sha256-YaXeApg0U97Bm+kBdFdmfnkgg9GBxxYdaDzgCVN2sbY="; + cargoHash = "sha256-rjUn8F6WSxLQGrFzK23q4ClLePSpcMN2+i7rC02Fisk="; - buildInputs = [ installShellFiles ]; - nativeBuildInputs = [ which ] ++ lib.optionals webUISupport [ emscripten ]; + buildInputs = + [ installShellFiles ] + ++ lib.optionals webUISupport [ + openssl + ]; + nativeBuildInputs = + [ which ] + ++ lib.optionals webUISupport [ + emscripten + pkg-config + ]; patches = lib.optionals (!webUISupport) [ (substitute { @@ -193,7 +204,7 @@ rustPlatform.buildRustPackage { preBuild = lib.optionalString webUISupport '' mkdir -p .emscriptencache export EM_CACHE=$(pwd)/.emscriptencache - bash ./script/build-wasm --debug + cargo run --package xtask -- build-wasm --debug ''; postInstall = |