From 80904599e666367fbde862bdef078345087a76bd Mon Sep 17 00:00:00 2001
From: Johan Larsson <jolars@posteo.com>
Date: Fri, 17 Jan 2025 13:40:13 +0100
Subject: [PATCH] build: use l3build wrapper

---
 .github/workflows/ci.yml |  4 ++--
 flake.nix                | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 030e6af..eebc80a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,9 +15,9 @@ jobs:
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
       - name: document
-        run: nix develop --command l3build doc
+        run: nix develop --command l3build-wrapper doc
       - name: build
-        run: nix develop --command l3build ctan -q -H --show-log-on-error
+        run: nix develop --command l3build-wrapper ctan -q -H --show-log-on-error
   release:
     if: ${{ github.ref == 'refs/heads/main' }}
     permissions:
diff --git a/flake.nix b/flake.nix
index 39d15d8..f32f2c0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,15 +33,20 @@
             microtype
             ;
         };
+        l3build-wrapped = pkgs.writeShellScriptBin "l3build-wrapped" ''
+          # NOTE: the trailing slash in TEXMF is required
+          TEXMF="${texlive}/" ${texlive}/bin/l3build "$@"
+        '';
       in
       {
         devShells.default = pkgs.mkShell {
           buildInputs = [
             texlive
+            l3build-wrapped
           ];
-          shellHook = ''
-            export TEXMF="${texlive}/"
-          '';
+          # shellHook = ''
+          #   export TEXMF="${texlive}/"
+          # '';
         };
       }
     );