[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/13: gnu: modifying make-chromium-extension to rely on node-crx3.
From: |
guix-commits |
Subject: |
13/13: gnu: modifying make-chromium-extension to rely on node-crx3. |
Date: |
Wed, 20 Jul 2022 11:14:41 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit cda3de3b7de46346457e75eb7022bc76a34c2d4f
Author: Nicolas Graves <ngraves@ngraves.fr>
AuthorDate: Wed Jul 20 12:39:34 2022 +0200
gnu: modifying make-chromium-extension to rely on node-crx3.
* gnu/build/chromium-extension.scm (make-crx): Lift Xorg and Chromium
dependencies, rely on node-crx3 instead.
Signed-off-by: Marius Bakke <marius@gnu.org>
---
gnu/build/chromium-extension.scm | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/gnu/build/chromium-extension.scm b/gnu/build/chromium-extension.scm
index 8ca5251957..28449a1e1d 100644
--- a/gnu/build/chromium-extension.scm
+++ b/gnu/build/chromium-extension.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,10 +20,9 @@
(define-module (gnu build chromium-extension)
#:use-module (guix gexp)
#:use-module (guix packages)
- #:use-module (gnu packages chromium)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages tls)
- #:use-module (gnu packages xorg)
+ #:use-module (gnu packages node-xyz)
#:use-module (guix build-system trivial)
#:export (make-chromium-extension))
@@ -69,24 +69,14 @@ in PACKAGE-OUTPUT of PACKAGE. The extension will be signed
with SIGNING-KEY."
(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
- ;; lighter. (TODO: where is the CRXv3 documentation..?)
(use-modules (guix build utils))
- (let ((chromium #$(file-append ungoogled-chromium "/bin/chromium"))
- (xvfb #$(file-append xorg-server "/bin/Xvfb"))
+ (let ((crx3 #+(file-append node-crx3 "/bin/crx3"))
(packdir (string-append (getcwd) "/extension")))
(mkdir packdir)
(copy-recursively (ungexp package package-output) packdir
;; Ensure consistent file modification times.
#:keep-mtime? #t)
- (system (string-append xvfb " :1 &"))
- (setenv "DISPLAY" ":1")
- (sleep 2) ;give Xorg some time to initialize...
- (invoke chromium
- "--user-data-dir=chromium-profile"
- (string-append "--pack-extension=" packdir)
- (string-append "--pack-extension-key=" #$signing-key))
+ (invoke crx3 "--keyPath" #$signing-key packdir)
(copy-file (string-append packdir ".crx") #$output))))
#:local-build? #t))
- 04/13: gnu: fossil: Update to 2.18., (continued)
- 04/13: gnu: fossil: Update to 2.18., guix-commits, 2022/07/20
- 10/13: gnu: Add node-pbf., guix-commits, 2022/07/20
- 08/13: gnu: Add node-resolve-protobuf-schema., guix-commits, 2022/07/20
- 02/13: gnu: fossil: Add 'release-monitoring-url' property., guix-commits, 2022/07/20
- 06/13: gnu: Add node-yazl., guix-commits, 2022/07/20
- 12/13: gnu: Add node-crx3., guix-commits, 2022/07/20
- 05/13: gnu: Add node-buffer-crc32., guix-commits, 2022/07/20
- 01/13: gnu: smb4k: Update to 3.1.3., guix-commits, 2022/07/20
- 09/13: gnu: Add node-ieee754., guix-commits, 2022/07/20
- 11/13: gnu: Add node-minimist., guix-commits, 2022/07/20
- 13/13: gnu: modifying make-chromium-extension to rely on node-crx3.,
guix-commits <=
- 03/13: gnu: SQLite: Update to 3.39.1., guix-commits, 2022/07/20
- 07/13: gnu: Add node-protocol-buffers-schema., guix-commits, 2022/07/20