Merge pull request #333528 from emilazy/push-uprruwmzypry

typst: patch `Cargo.lock` for Rust 1.80
NixOS · Aug 11, 2024 · 21796a3 · 21796a3
2 parents 5d06d0d + 4daa382
commit 21796a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pkgs/by-name/ty/typst/Cargo.lock b/pkgs/by-name/ty/typst/Cargo.lock
diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix
@@ -47,10 +47,13 @@ rustPlatform.buildRustPackage rec {
     OPENSSL_NO_VENDOR = true;
   };
 
-  # Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context"
   postPatch = ''
+    # Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context"
     substituteInPlace tests/src/tests.rs --replace-fail 'ARGS.num_threads' 'ARGS.test_threads'
     substituteInPlace tests/src/args.rs --replace-fail 'num_threads' 'test_threads'
+
+    # Fix build with Rust 1.80; remove on next release
+    ln -sf ${./Cargo.lock} Cargo.lock
   '';
 
   postInstall = ''