From 5be52ab75730a83bcb691a53a80d3ef17152782f Mon Sep 17 00:00:00 2001
From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com>
Date: Mon, 7 Aug 2023 19:24:55 +0100
Subject: [PATCH] texlive.tlshell: hardcode revision numbers missing from
 minimal texlive.tlpdb

---
 pkgs/test/texlive/default.nix                  | 5 +----
 pkgs/tools/typesetting/tex/texlive/default.nix | 6 ++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix
index 0691dad661d7..d3894eb3fd8b 100644
--- a/pkgs/test/texlive/default.nix
+++ b/pkgs/test/texlive/default.nix
@@ -234,9 +234,6 @@
 
         # 'Error initialising QuantumRenderer: no suitable pipeline found'
         "tlcockpit"
-
-        # 'tlmgr: config.guess script does not exist, goodbye'
-        "tlshell"
       ] ++ lib.optional stdenv.isDarwin "epspdftk";  # wish shebang is a script, not a binary!
 
       # (1) binaries requiring -v
@@ -271,7 +268,7 @@
         "dt2dv" "dv2dt" "dvi2tty" "dvidvi" "dvispc" "otp2ocp" "outocp" "pmxab"
 
         # GUI scripts that accept no argument or crash without a graphics server; please test manualy
-        "epspdftk" "texdoctk" "xasy"
+        "epspdftk" "texdoctk" "tlshell" "xasy"
 
         # requires Cinderella, not open source and not distributed via Nixpkgs
         "ketcindy"
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 7d4eb1728899..6c194e65dcdd 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -352,6 +352,12 @@ let
         substituteInPlace "$out"/bin/* --replace java "$interpJava"
       '';
 
+      # hardcode revision numbers (since texlive.infra, tlshell are not in either system or user texlive.tlpdb)
+      tlshell.postFixup = ''
+        substituteInPlace "$out"/bin/tlshell \
+          --replace '[dict get $::pkgs texlive.infra localrev]' '${toString overridden."texlive.infra".revision}' \
+          --replace '[dict get $::pkgs tlshell localrev]' '${toString overridden.tlshell.revision}'
+      '';
       #### dependency changes
 
       # it seems to need it to transform fonts