From a8eca96edb54dde86c6a23116a505773b86b1bc6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 19 Apr 2026 14:31:18 +0300 Subject: [PATCH] texpresso: small semantic changes --- pkgs/by-name/te/texpresso/package.nix | 48 ++++++++++++++++----------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/te/texpresso/package.nix b/pkgs/by-name/te/texpresso/package.nix index 6ee830876cdd..5427a98ddd5b 100644 --- a/pkgs/by-name/te/texpresso/package.nix +++ b/pkgs/by-name/te/texpresso/package.nix @@ -1,19 +1,25 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, + + # nativeBuildInputs makeWrapper, - writeScript, - mupdf, - SDL2, - re2c, + + # buildInputs freetype, - jbig2dec, - harfbuzz, - openjpeg, gumbo, + harfbuzz, + jbig2dec, libjpeg, + mupdf, + openjpeg, + re2c, + SDL2, + + # passthru callPackage, + writeScript, }: stdenv.mkDerivation (finalAttrs: { @@ -40,28 +46,30 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - mupdf - SDL2 - re2c freetype - jbig2dec - harfbuzz - openjpeg gumbo + harfbuzz + jbig2dec libjpeg + mupdf + openjpeg + re2c + SDL2 ]; - buildFlags = [ "texpresso" ]; + buildFlags = [ + "texpresso" + ]; - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.hostPlatform.isDarwin [ + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-function-declaration" - ] - ); + ]; + }; installPhase = '' runHook preInstall - install -Dm0755 -t "$out/bin/" "build/texpresso" + install -D -t "$out/bin/" "build/texpresso" runHook postInstall '';