From c10f03f52bf1207a10047eac13ccfbf39f1ac3f2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 24 Nov 2025 12:21:11 +0200 Subject: [PATCH] texlivePackages.git-latexdiff: inherit top-level attribute --- pkgs/tools/typesetting/tex/texlive/default.nix | 2 ++ pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 94bd06efacaa..155c2c801983 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -14,6 +14,7 @@ buildEnv, callPackage, ghostscript_headless, + git-latexdiff, harfbuzz, makeWrapper, installShellFiles, @@ -79,6 +80,7 @@ let gawk getopt ghostscript_headless + git-latexdiff gnugrep gnumake gnupg diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix index 489fc23c05eb..df72bce8ffc1 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -12,6 +12,7 @@ gawk, getopt, ghostscript_headless, + git-latexdiff, gnugrep, gnumake, gnupg, @@ -545,6 +546,12 @@ lib.recursiveUpdate orig rec { fi ''; + # Use top-level git-latexdiff's version and src. NOTE that this derivation is + # still different from top-level's `git-latexdiff`, due to __structuredAttrs + # enabled unconditionally. Still though this derivation produces a funcitonal + # binary. + inherit git-latexdiff; + # RISC-V: https://github.com/LuaJIT/LuaJIT/issues/628 luajittex.binfiles = lib.optionals (lib.meta.availableOn stdenv.hostPlatform luajit) orig.luajittex.binfiles;