me
/
guix
Archived
1
0
Fork 0
Code

chromium-extension: Compute json at argument evaluation time. 

* gnu/build/chromium-extension.scm (make-chromium-extension): Make use of the
make-signing-key procedure inside the argument field, making sure that it is
not evaluated at file-load time.  This would otherwise try to resolve gnutls
when we can't guarantee it's defined because of dependency cycles.

Change-Id: Ia7b13acfbca475c2df073e9a88fc8bb9264dd968
master
Josselin Poiret 2023-12-27 17:18:52 +01:00
parent 8f03a51f5c
commit 93ac4c20bf
No known key found for this signature in database
GPG Key ID: 505E40B916171A8A
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/build/chromium-extension.scm
View File

@ -120,12 +120,7 @@ format."
when installed, will make the extension contained in PKG available as a when installed, will make the extension contained in PKG available as a
Chromium browser extension. PKG-OUTPUT specifies which output of PKG to use." Chromium browser extension. PKG-OUTPUT specifies which output of PKG to use."
(let* ((name (package-name pkg)) (let* ((name (package-name pkg))
(version (package-version pkg)) (version (package-version pkg)))
(private-key (make-signing-key name))
(public-key (signing-key->public-der private-key))
(checksum (file-sha256sum public-key))
(crx (make-crx private-key pkg pkg-output))
(json (crx->chromium-json crx version)))
(package (package
(inherit pkg) (inherit pkg)
(name (string-append name "-chromium")) (name (string-append name "-chromium"))
@ -138,6 +133,12 @@ Chromium browser extension. PKG-OUTPUT specifies which output of PKG to use."
(arguments (arguments
(list #:modules '((guix build utils)) (list #:modules '((guix build utils))
#:builder #:builder
(let*
((private-key (make-signing-key name))
(public-key (signing-key->public-der private-key))
(checksum (file-sha256sum public-key))
(crx (make-crx private-key pkg pkg-output))
(json (crx->chromium-json crx version)))
#~(begin #~(begin
(use-modules (guix build utils)) (use-modules (guix build utils))
(define (base16-char->chromium-base16 char) (define (base16-char->chromium-base16 char)
@ -152,4 +153,4 @@ Chromium browser extension. PKG-OUTPUT specifies which output of PKG to use."
"/share/chromium/extensions"))) "/share/chromium/extensions")))
(mkdir-p extension-directory) (mkdir-p extension-directory)
(symlink #$json (string-append extension-directory "/" (symlink #$json (string-append extension-directory "/"
file-name ".json"))))))))) file-name ".json"))))))))))