From d12e75647404fb53470beaabcad0c647d02506e2 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 29 Sep 2026 03:06:22 +0200 Subject: [PATCH] tree-sitter: fix riscv64-linux build --- pkgs/by-name/tr/tree-sitter/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/tr/tree-sitter/package.nix b/pkgs/by-name/tr/tree-sitter/package.nix index f16b467c5821..ebd2c362f222 100644 --- a/pkgs/by-name/tr/tree-sitter/package.nix +++ b/pkgs/by-name/tr/tree-sitter/package.nix @@ -193,6 +193,13 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace ./Makefile \ --replace-fail 'all: libtree-sitter.a libtree-sitter.$(SOEXT) tree-sitter.pc' 'all: libtree-sitter.a tree-sitter.pc' sed -i '/^install:/,/^[^[:space:]]/ { /$(SOEXT/d; }' ./Makefile + '' + # rquickjs-sys passes the raw rust target to clang, which does not know riscv64gc + + lib.optionalString stdenv.hostPlatform.isRiscV64 '' + substituteInPlace $cargoDepsCopy/source-*/rquickjs-sys-*/build.rs \ + --replace-fail \ + 'let mut cflags = vec![format!("--target={}", target)];' \ + 'let mut cflags = vec![format!("--target={}", target.replace("riscv64gc", "riscv64"))];' ''; # The Makefile install can't enable the wasm feature.