pyrox.dev / nixpkgs
lol
fork atom

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.

Doron Behar 4f9aa092 1f0985d9

+3 -3
unified split
+3 -3
pkgs/tools/typesetting/tectonic/default.nix
··· 7 , harfbuzz 8 , openssl 9 , pkg-config 10 - , makeWrapper 11 , biber 12 , icu 13 }: ··· 26 27 cargoSha256 = "awDVjJLwgpSMbwptmLhczaxB5HqvsdvEOUsLYb/zTUc="; 28 29 - nativeBuildInputs = [ pkg-config makeWrapper ]; 30 31 buildInputs = [ icu fontconfig harfbuzz openssl ] 32 ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); ··· 35 # https://github.com/tectonic-typesetting/tectonic/releases/tag/tectonic%400.7.0 36 postInstall = '' 37 wrapProgram $out/bin/tectonic \ 38 - --prefix PATH "${lib.getBin biber}/bin" 39 '' + lib.optionalString stdenv.isLinux '' 40 substituteInPlace dist/appimage/tectonic.desktop \ 41 --replace Exec=tectonic Exec=$out/bin/tectonic
··· 7 , harfbuzz 8 , openssl 9 , pkg-config 10 + , makeBinaryWrapper 11 , biber 12 , icu 13 }: ··· 26 27 cargoSha256 = "awDVjJLwgpSMbwptmLhczaxB5HqvsdvEOUsLYb/zTUc="; 28 29 + nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; 30 31 buildInputs = [ icu fontconfig harfbuzz openssl ] 32 ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); ··· 35 # https://github.com/tectonic-typesetting/tectonic/releases/tag/tectonic%400.7.0 36 postInstall = '' 37 wrapProgram $out/bin/tectonic \ 38 + --prefix PATH : "${lib.getBin biber}/bin" 39 '' + lib.optionalString stdenv.isLinux '' 40 substituteInPlace dist/appimage/tectonic.desktop \ 41 --replace Exec=tectonic Exec=$out/bin/tectonic