From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id gLdOAf1bqGKxpQAAbAwnHQ (envelope-from ) for ; Tue, 14 Jun 2022 11:59:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iIXnAP1bqGKZLAAAauVa8A (envelope-from ) for ; Tue, 14 Jun 2022 11:59:25 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 68A459A10 for ; Tue, 14 Jun 2022 11:59:24 +0200 (CEST) Received: from localhost ([::1]:56762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o13KV-0007kL-EJ for larch@yhetil.org; Tue, 14 Jun 2022 05:59:23 -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) 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1655200764; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=03nCdCJO9gFnmSS6JRpwNFGF4EkBQ96Q+bKHG5JMLoc=; b=dcUmfbjie41ujqZFQQLB5UcuGW2yUqwNZyw6DzIMs8I3ClARaAT4M9NMczGhgDp6svuNPR jZ3/ChS2HLEV/ENmtUpMP7WtI5Lho+7np2uxlBbpv2Vwwm+N1/DciPpgmQTRaDBi0cuiqv Jw5pc0tY9D98s5HBvjt3bY6l1/R22LFYI801G0V3+s1Yk8VGYodYUYarUU4tU4vaTnSkKw SsDj3arNhJ490PJrTzOLI5q+Q3oDhOD8ndqTGmI6cQB6AkjIGxxEZQMCkIhgKBBhKllSG2 WLepmrWhFnnMzf3fRhr0xYDNgPvn1O3vynfIlziBhdoNDrC7kG3kIsTOnsweNQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655200764; a=rsa-sha256; cv=none; b=T+Cf1fl1mkeH173TVrpHfVdS7afU/f37y2LYLYKGf0DQZHk218kXT/qUQAhD+Lk7EKLLH2 cG/8/Js5n2kBtPYscDVNNpOB+zOS4f55ZqDoSCyHMW0tedLVZlssNIoXpZC+ki72Wekwb9 N7D55aPb8M8/YYyUiMWdE7pw9igY83iXNz+xkELXnURa5AYqqYecUMz8kTfhDz6a/Mgh6T wAeivH8tWibnAmblp3PeCancynEywDRkG60isCTQcyERYEIchyoyJ0Qatx+YGcjG6Akywr Fz956O7lFUrpBdbQAA2FuJsRy226OVLaiJWzm/7RDQZUv4QuNduLYMnfdQvyxg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.79 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 68A459A10 X-Spam-Score: -4.79 X-Migadu-Scanner: scn0.migadu.com X-TUID: gONquQLR/Y3x --- 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)) -- 2.36.1