Skip to content

Commit 21796a3

Browse files
authored
Merge pull request #333528 from emilazy/push-uprruwmzypry
typst: patch `Cargo.lock` for Rust 1.80
2 parents 5d06d0d + 4daa382 commit 21796a3

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

pkgs/by-name/ty/typst/Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkgs/by-name/ty/typst/package.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,13 @@ rustPlatform.buildRustPackage rec {
4747
OPENSSL_NO_VENDOR = true;
4848
};
4949

50-
# Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context"
5150
postPatch = ''
51+
# Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context"
5252
substituteInPlace tests/src/tests.rs --replace-fail 'ARGS.num_threads' 'ARGS.test_threads'
5353
substituteInPlace tests/src/args.rs --replace-fail 'num_threads' 'test_threads'
54+
55+
# Fix build with Rust 1.80; remove on next release
56+
ln -sf ${./Cargo.lock} Cargo.lock
5457
'';
5558

5659
postInstall = ''

0 commit comments

Comments
 (0)