From patchwork Wed Jul 20 10:39:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 3815 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 81BA127BBEA; Wed, 20 Jul 2022 11:40:12 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 337B827BBE9 for ; Wed, 20 Jul 2022 11:40:12 +0100 (BST) Received: from localhost ([::1]:53046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oE77j-0007Nz-CM for patchwork@mira.cbaines.net; Wed, 20 Jul 2022 06:40:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oE77b-0007Nc-Fj for guix-patches@gnu.org; Wed, 20 Jul 2022 06:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58172) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oE77b-00018C-6g for guix-patches@gnu.org; Wed, 20 Jul 2022 06:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oE77b-0000Hr-0T for guix-patches@gnu.org; Wed, 20 Jul 2022 06:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55966] [PATCH] gnu: modifying make-chromium-extension to rely on node-crx3. References: <20220614094954.15197-9-ngraves@ngraves.fr> In-Reply-To: <20220614094954.15197-9-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Jul 2022 10:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55966 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55966@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 55966-submit@debbugs.gnu.org id=B55966.1658313583983 (code B ref 55966); Wed, 20 Jul 2022 10:40:02 +0000 Received: (at 55966) by debbugs.gnu.org; 20 Jul 2022 10:39:43 +0000 Received: from localhost ([127.0.0.1]:55931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oE77G-0000Fn-MB for submit@debbugs.gnu.org; Wed, 20 Jul 2022 06:39:43 -0400 Received: from 9.mo584.mail-out.ovh.net ([46.105.40.176]:43429) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oE77D-0000Fb-MZ for 55966@debbugs.gnu.org; Wed, 20 Jul 2022 06:39:41 -0400 Received: from player728.ha.ovh.net (unknown [10.111.172.211]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 0B064248AF for <55966@debbugs.gnu.org>; Wed, 20 Jul 2022 10:39:38 +0000 (UTC) Received: from ngraves.fr (unknown [176.166.159.77]) (Authenticated sender: ngraves@ngraves.fr) by player728.ha.ovh.net (Postfix) with ESMTPSA id 82FAC2CBC3404; Wed, 20 Jul 2022 10:39:36 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-108S002221651bb-2e7a-4523-b9ff-3df1960b386b, 129C31CF0BB9A5A41165496B287D5FC7981061FF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.166.159.77 Date: Wed, 20 Jul 2022 12:39:34 +0200 Message-Id: <20220720103934.17768-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.37.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 15810167968178823906 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrudelvddgfedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffogggtgfesthekredtredtreenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeefjeffledugfetgffhtdevfeelheeihfevhefgkeektdfhkeejheegvdehjeetheenucfkpheptddrtddrtddrtddpudejiedrudeiiedrudehledrjeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhejvdekrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepheehleeiieesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekge 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 (make-crx): Lift Xorg and Chromium dependencies, rely on node-crx3 instead. --- 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 +;;; Copyright © 2022 Nicolas Graves ;;; ;;; 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 @@ (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))