From patchwork Tue Jun 14 09:49:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 40003 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5BECF27BBEA; Tue, 14 Jun 2022 10:59:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B87D627BBE9 for ; Tue, 14 Jun 2022 10:59:21 +0100 (BST) Received: from localhost ([::1]:56762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o13KS-0007kL-U7 for patchwork@mira.cbaines.net; Tue, 14 Jun 2022 05:59:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o13CW-0000E7-Ch for guix-patches@gnu.org; Tue, 14 Jun 2022 05:51:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o13CU-00024v-GD for guix-patches@gnu.org; Tue, 14 Jun 2022 05:51:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o13CU-0002vT-Fh for guix-patches@gnu.org; Tue, 14 Jun 2022 05:51:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55966] [PATCH 9/9] gnu: chromium extensions lighter make-crx. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Jun 2022 09:51:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55966 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55966@debbugs.gnu.org Cc: Nicolas Graves X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165520025411116 (code B ref -1); Tue, 14 Jun 2022 09:51:06 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jun 2022 09:50:54 +0000 Received: from localhost ([127.0.0.1]:32979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o13CI-0002tE-GS for submit@debbugs.gnu.org; Tue, 14 Jun 2022 05:50:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:53534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o13C8-0002sI-VF for submit@debbugs.gnu.org; Tue, 14 Jun 2022 05:50:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o13C7-0008QR-Kv for guix-patches@gnu.org; Tue, 14 Jun 2022 05:50:44 -0400 Received: from 9.mo575.mail-out.ovh.net ([46.105.78.111]:58327) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o13C5-00021P-OI for guix-patches@gnu.org; Tue, 14 Jun 2022 05:50:43 -0400 Received: from player746.ha.ovh.net (unknown [10.109.156.194]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 7F02524A41 for ; Tue, 14 Jun 2022 09:50:40 +0000 (UTC) Received: from ngraves.fr (unknown [176.166.159.77]) (Authenticated sender: ngraves@ngraves.fr) by player746.ha.ovh.net (Postfix) with ESMTPSA id 2901D1E2E0CC0; Tue, 14 Jun 2022 09:50:38 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-109S003777eda67-933b-491e-8fb4-95f9b9b01f17, F2255CAF11B24C4280F910282C1ED9962B83CC59) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.166.159.77 Date: Tue, 14 Jun 2022 11:49:54 +0200 Message-Id: <20220614094954.15197-9-ngraves@ngraves.fr> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220614094954.15197-1-ngraves@ngraves.fr> References: <20220614094954.15197-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6480679867763385058 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrudduledgudelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppedtrddtrddtrddtpddujeeirdduieeirdduheelrdejjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepphhlrgihvghrjeegiedrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhe Received-SPF: pass client-ip=46.105.78.111; envelope-from=ngraves@ngraves.fr; helo=9.mo575.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves X-getmail-retrieved-from-mailbox: Patches --- gnu/build/chromium-extension.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/build/chromium-extension.scm b/gnu/build/chromium-extension.scm index 8ca5251957..8d52153751 100644 --- a/gnu/build/chromium-extension.scm +++ b/gnu/build/chromium-extension.scm @@ -19,10 +19,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 +68,14 @@ (define version (package-version package)) (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))