Skip to content

[Backport staging-25.11] tree-sitter: fix pkgsStatic build #496892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nixpkgs-ci wants to merge 1 commit into
base: staging-25.11
Choose a base branch
from
Open

[Backport staging-25.11] tree-sitter: fix pkgsStatic build #496892

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions pkgs/development/tools/parsing/tree-sitter/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,19 @@ rustPlatform.buildRustPackage {
})
];

postPatch = lib.optionalString webUISupport ''
substituteInPlace cli/loader/src/lib.rs \
--replace-fail 'let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" };' 'let emcc_name = "${lib.getExe' emscripten "emcc"}";'
'';
postPatch =
lib.optionalString webUISupport ''
substituteInPlace cli/loader/src/lib.rs \
--replace-fail 'let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" };' 'let emcc_name = "${lib.getExe' emscripten "emcc"}";'
''
# when building on static platforms:
# 1. remove the `libtree-sitter.$(SOEXT)` step from `all`
# 2. remove references to shared object files in the Makefile
+ lib.optionalString stdenv.hostPlatform.isStatic ''
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
'';

# Compile web assembly with emscripten. The --debug flag prevents us from
# minifying the JavaScript; passing it allows us to side-step more Node
Expand All @@ -209,8 +218,8 @@ rustPlatform.buildRustPackage {

postInstall = ''
PREFIX=$out make install
${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"}
${lib.optionalString (!enableStatic) "rm $out/lib/*.a"}
${lib.optionalString (!enableShared) "rm -f $out/lib/*.so{,.*}"}
${lib.optionalString (!enableStatic) "rm -f $out/lib/*.a"}
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd tree-sitter \
Expand Down
Loading