Merge f41cca8b0027cbd3bb66e93bf523ab9efeef2300 into 9b09146a6b5e936966ed7ee73bce9dd2df3810ae

This commit is contained in:
Michael Fortunato 2025-05-07 22:24:37 +00:00 committed by GitHub
commit 1d9f00fef3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -29,7 +29,11 @@
pname = "typst";
version = cargoToml.workspace.package.version;
rust-toolchain = (fenix.packages.${system}.fromManifestFile rust-manifest).defaultToolchain;
rust-toolchain = fenix.packages.${system}.combine [
(fenix.packages.${system}.fromManifestFile
rust-manifest).defaultToolchain
(fenix.packages.${system}.fromManifestFile rust-manifest).rust-src
];
# Crane-based Nix flake configuration.
# Based on https://github.com/ipetkov/crane/blob/master/examples/trunk-workspace/flake.nix
@ -127,6 +131,12 @@
checks = self'.checks;
inputsFrom = [ typst ];
# Set environment variables for rust-analyzer
shellHook = ''
export RUST_SRC_PATH="${rust-toolchain}/lib/rustlib/src/rust/library"
export RUST_BACKTRACE=1
'';
packages = [
# A script for quickly running tests.
# See https://github.com/typst/typst/blob/main/tests/README.md#making-an-alias