From 4f9aa092fbf2f63fd96fee6dec08ca5ef5f19202 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 7 Oct 2022 10:36:32 +0300 Subject: [PATCH] tectonic: Fix wrapping adding biber to PATH Due to missing `:`, wrapProgram didn't really add biber's bin dir to PATH. Using the `makeBinaryWrapper` implementation detects such mistakes during compilation. --- pkgs/tools/typesetting/tectonic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 27417284caf2..0eaf307591fd 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -7,7 +7,7 @@ , harfbuzz , openssl , pkg-config -, makeWrapper +, makeBinaryWrapper , biber , icu }: @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "awDVjJLwgpSMbwptmLhczaxB5HqvsdvEOUsLYb/zTUc="; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; buildInputs = [ icu fontconfig harfbuzz openssl ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { # https://github.com/tectonic-typesetting/tectonic/releases/tag/tectonic%400.7.0 postInstall = '' wrapProgram $out/bin/tectonic \ - --prefix PATH "${lib.getBin biber}/bin" + --prefix PATH : "${lib.getBin biber}/bin" '' + lib.optionalString stdenv.isLinux '' substituteInPlace dist/appimage/tectonic.desktop \ --replace Exec=tectonic Exec=$out/bin/tectonic