me/guix
Archived
1
0
Fork 0
Code Activity

chromium-extension: Reduce imported-modules scope.

Browse source 
* gnu/build/chromium-extension.scm (make-crx): Delay with-imported-modules
until the builder code.
(crx->chromium-json): Remove needless define* while at it.
This commit is contained in:
Marius Bakke 2021-12-16 19:04:21 +01:00
parent f59bb27557
commit 173860eb41
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/build/chromium-extension.scm
View file

@ -68,9 +68,9 @@ in PACKAGE-OUTPUT of PACKAGE. The extension will be signed with SIGNING-KEY."
(define name (package-name package)) (define name (package-name package))
(define version (package-version package)) (define version (package-version package))
(with-imported-modules '((guix build utils)) (computed-file
(computed-file (string-append name "-" version ".crx")
(string-append name "-" version ".crx") (with-imported-modules '((guix build utils))
#~(begin #~(begin
;; This is not great. We pull Xorg and Chromium just to Zip and ;; This is not great. We pull Xorg and Chromium just to Zip and
;; sign an extension. This should be implemented with something ;; 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" "--user-data-dir=/tmp/signing-profile"
(string-append "--pack-extension=" packdir) (string-append "--pack-extension=" packdir)
(string-append "--pack-extension-key=" #$signing-key)) (string-append "--pack-extension-key=" #$signing-key))
(copy-file (string-append packdir ".crx") #$output))) (copy-file (string-append packdir ".crx") #$output))))
#:local-build? #t))) #: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 "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 extension given as CRX. VERSION is used to signify the CRX version, and
must match the version listed in the extension manifest.json." must match the version listed in the extension manifest.json."