From b12a306304bc0176cd25bf544631233fbfca36a1 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Thu, 8 Aug 2024 21:09:46 +0800 Subject: [PATCH] tectonic-unwrapped, tectonic: fix build Add patch bumping the `time` crate, fix build with rust 1.80. --- pkgs/tools/typesetting/tectonic/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 3320e91e51b9..0cc8b18de92a 100644 --- 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 ];