diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-11-17 15:39:06 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-11-17 15:44:33 +0100 |
| commit | 21357224bc1f450931fb3a64fe6d06f9d1137b67 (patch) | |
| tree | 5c2ab8205c9982e8f363aca75865a9cf7fe6aa5a | |
| parent | c3931a5454475a940983e80066a3c835cc07f66e (diff) | |
| download | guix-21357224bc1f450931fb3a64fe6d06f9d1137b67.tar.gz guix-21357224bc1f450931fb3a64fe6d06f9d1137b67.zip | |
import: texlive: Load (gnu packages tex) dynamically.
Fixes a bug whereby 'guix pull' would fail with this guix-extra.drv
build failure:
ice-9/eval.scm:163:9: ERROR:
1. &formatted-message:
format: "~a: patch not found\n"
arguments: ("nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch")
Reported by ekaitz on #guix.
Regression introduced in 3b1a12c5bff5a0c108284d19a6982bdf663bbceb.
* guix/import/texlive.scm: Autoload (gnu packages tex).
fixlet
| -rw-r--r-- | guix/import/texlive.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 8677caee59..d0307ae944 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -38,7 +38,6 @@ #:use-module (guix upstream) #:use-module (guix packages) #:use-module (guix build-system texlive) - #:use-module (gnu packages tex) #:export (texlive->guix-package texlive-recursive-import)) @@ -111,6 +110,12 @@ name))) (define (tlpdb-file) + (define texlive-bin + ;; Resolve this variable lazily so that (gnu packages ...) does not end up + ;; in the closure of this module. + (module-ref (resolve-interface '(gnu packages tex)) + 'texlive-bin)) + (with-store store (run-with-store store (mlet* %store-monad |