From c98ef4642cb92d9e8d992f0c269ed6c1257f7187 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Tue, 27 Feb 2024 17:32:54 +0800 Subject: [PATCH] tectonic: build with nixpkgs harfbuzz Build with the harfbuzz shared library from nixpkgs. This is well supported by upstream through a cargo feature flag. Previously the build uses a vendored harfbuzz housed in a git submodule. This can be inconvenient when developing the package. This commit eliminate the need to fetch git submodules. --- pkgs/tools/typesetting/tectonic/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index e7172e608746..1e2c58d60356 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; - fetchSubmodules = true; sha256 = "sha256-xZHYiaQ8ASUwu0ieHIXcjRaH06SQoB6OR1y7Ok+FjAs="; }; @@ -34,6 +33,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; + buildFeatures = [ "external-harfbuzz" ]; + buildInputs = [ icu fontconfig harfbuzz openssl ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]);