From 173860eb41102c5af2cfdc0404808075d5a5ff3a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Dec 2021 19:04:21 +0100 Subject: chromium-extension: Reduce imported-modules scope. * gnu/build/chromium-extension.scm (make-crx): Delay with-imported-modules until the builder code. (crx->chromium-json): Remove needless define* while at it. --- gnu/build/chromium-extension.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/build/chromium-extension.scm b/gnu/build/chromium-extension.scm index 81c68f25a6..fb157127d5 100644 --- a/gnu/build/chromium-extension.scm +++ b/gnu/build/chromium-extension.scm @@ -68,9 +68,9 @@ in PACKAGE-OUTPUT of PACKAGE. The extension will be signed with SIGNING-KEY." (define name (package-name package)) (define version (package-version package)) - (with-imported-modules '((guix build utils)) - (computed-file - (string-append name "-" version ".crx") + (computed-file + (string-append name "-" version ".crx") + (with-imported-modules '((guix build utils)) #~(begin ;; This is not great. We pull Xorg and Chromium just to Zip and ;; sign an extension. This should be implemented with something @@ -95,10 +95,10 @@ in PACKAGE-OUTPUT of PACKAGE. The extension will be signed with SIGNING-KEY." "--user-data-dir=/tmp/signing-profile" (string-append "--pack-extension=" packdir) (string-append "--pack-extension-key=" #$signing-key)) - (copy-file (string-append packdir ".crx") #$output))) - #:local-build? #t))) + (copy-file (string-append packdir ".crx") #$output)))) + #:local-build? #t)) -(define* (crx->chromium-json crx version) +(define (crx->chromium-json crx version) "Return a derivation that creates a Chromium JSON settings file for the extension given as CRX. VERSION is used to signify the CRX version, and must match the version listed in the extension manifest.json." -- cgit 1.4.1