Merge pull request #333143 from bryango/tectonic-rust-1.80-fix

tectonic-unwrapped, tectonic: fix build
NixOS · Aug 9, 2024 · 788ccaa · 788ccaa
2 parents b7e1f2f + b12a306
commit 788ccaa
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
@@ -16,6 +16,7 @@
 , openssl
 , pkg-config
 , icu
+, fetchpatch2
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -29,7 +30,15 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-xZHYiaQ8ASUwu0ieHIXcjRaH06SQoB6OR1y7Ok+FjAs=";
   };
 
-  cargoHash = "sha256-niMgb4zsTWHw5yaa4kJOZzpOzO5gMG4k3cTHwSV+wmY=";
+  cargoPatches = [
+    # fix build with rust 1.80
+    (fetchpatch2 {
+      url = "https://github.com/tectonic-typesetting/tectonic/commit/6b49ca8db40aaca29cb375ce75add3e575558375.patch";
+      hash = "sha256-i1L3XaSuBbsmgOSXIWVqr6EHlHGs8A+6v06kJ3C50sk=";
+    })
+  ];
+
+  cargoHash = "sha256-Zn+xU6NJOY+jDYrSGsbYGAVqprQ6teEdNvlTNDXuzKs=";
 
   nativeBuildInputs = [ pkg-config ];