From patchwork Sun Jan 7 00:05:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 58438 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 204B027BBE9; Sun, 7 Jan 2024 00:06:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 3019427BBE2 for ; Sun, 7 Jan 2024 00:06:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMGfz-0008S7-Lb; Sat, 06 Jan 2024 19:06:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMGfv-0008RZ-Ud for guix-patches@gnu.org; Sat, 06 Jan 2024 19:06:00 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMGfv-0006DL-8i for guix-patches@gnu.org; Sat, 06 Jan 2024 19:05:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMGfy-0001ew-9H; Sat, 06 Jan 2024 19:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68298] [PATCH 2/2] gnu: Add output in =?utf-8?b?4oCYbWFrZS1p?= =?utf-8?b?Y2VjYXQtZXh0ZW5zaW9u4oCZ?= for each Firefox variant. Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: clement@lassieur.org, jonathan.brielmaier@web.de, guix-patches@gnu.org Resent-Date: Sun, 07 Jan 2024 00:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68298 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68298@debbugs.gnu.org Cc: =?utf-8?q?Cl=C3=A9ment?= Lassieur , =?utf-8?q?Cl?= =?utf-8?q?=C3=A9ment?= Lassieur , Jonathan Brielmaier X-Debbugs-Original-Xcc: =?utf-8?q?Cl=C3=A9ment?= Lassieur , Jonathan Brielmaier Received: via spool by 68298-submit@debbugs.gnu.org id=B68298.17045859486350 (code B ref 68298); Sun, 07 Jan 2024 00:06:02 +0000 Received: (at 68298) by debbugs.gnu.org; 7 Jan 2024 00:05:48 +0000 Received: from localhost ([127.0.0.1]:60425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMGfk-0001eL-2S for submit@debbugs.gnu.org; Sat, 06 Jan 2024 19:05:48 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:53907) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMGfh-0001dw-Ur for 68298@debbugs.gnu.org; Sat, 06 Jan 2024 19:05:46 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id 90F6D5C00FB; Sat, 6 Jan 2024 19:05:35 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Sat, 06 Jan 2024 19:05:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1704585935; x=1704672335; bh=4sMmIGKs+eZeKLb67g6tvfGszXpRrPVmVnnuHDURMzc=; b= eSlqBNnA5ca/ffbp68/dDyLgPTj5AtoLVs0jueF0rdG8r0ML9vV6C85rB6oMYZVi kD6q1STP6ZX8Oe49x4HIyVQn+6jnP0NTj4JGzn4haY+APJA02kGZ8w98zFNMtLkP hy4688dWg8osypSg6GhBO4+sCLMJVgvQVTieGKNqJoyjDTDx8Mf2U1J+um5xZ57u 8gKZbMFb244BshliIvyvaXr4fKBXil0UDbkcWosOd/7xNORzytm/FnO4qmAaYmvE 4eOw9ZGRBLzJMXIgvR9xcQR7ixGdllat72OgOxyvB7DqpbVTjwDDViSZQnkp3bBq 5DEpgr6vutL3TJzDc6cX3Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1704585935; x= 1704672335; bh=4sMmIGKs+eZeKLb67g6tvfGszXpRrPVmVnnuHDURMzc=; b=p Z3L1LFGOi9Nw53N2l9zpabfpz6cwzgBt9GONa8AV4t43uSk424vOPouvgsAowlbe FtjEtRUl6RAasp54kyn7OpVSm89zgJmd0ymKm7TnO50cjLiAKKUOPyiN/7jFzP+e isRb0AAv7woGmS5DAEimmRRnznmwYzXVBO8wWw0VfR8watwyOkX8pKUawI3gWCTh Trb7BPrJFVMDjtdqh5x3DEIgNEUQnBc6LCCFscePsoJ75Latg6wxA/M3N8gE8dHl HK2Uh0Hqt8aGKqNdUxyWwCpoY7EfRpYdbdQBxJdz6zQ0rEPZVQVy6pQM9MY12gBo WEdFYeQ0PA3E6xxuoSt7Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehvddgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepvehlrohmvghnthcunfgrshhsihgvuhhruceotghlvghm vghntheslhgrshhsihgvuhhrrdhorhhgqeenucggtffrrghtthgvrhhnpeegtdefkedtve egueehkedukeffkeetieffleevudfggedvteekkedvveeujeekveenucffohhmrghinhep thhorhhprhhojhgvtghtrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomheptghlvghmvghntheslhgrshhsihgvuhhrrdhorhhg X-ME-Proxy: Feedback-ID: i4c21472a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 6 Jan 2024 19:05:34 -0500 (EST) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Sun, 7 Jan 2024 01:05:16 +0100 Message-ID: <7589f9fabe96ed501e5d8b5eac7ec21dcdfc2589.1704584830.git.clement@lassieur.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/build/icecat-extension.scm (make-icecat-extension)[arguments]: Loop through all variants and for each variant, symlink the add-on there, and in the main output too. * gnu/packages/tor.scm (torbrowser)[arguments]: Add a 'fix-system-dir' phase so that the system directory is not shared between variants. [propagated-inputs]: Propagate only the "torbrowser" output of noscript/icecat. [native-search-paths]: Use TORBROWSER_SYSTEM_DIR instead of inheriting from the icecat package. Change-Id: I409bae5c317e98d1bd308eb64a66f1ce1a304bcc --- gnu/build/icecat-extension.scm | 28 +++++++++++++++++++--------- gnu/packages/tor.scm | 11 ++++++++++- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/gnu/build/icecat-extension.scm b/gnu/build/icecat-extension.scm index 9013ab0fac05..b5d44e3b5559 100644 --- a/gnu/build/icecat-extension.scm +++ b/gnu/build/icecat-extension.scm @@ -34,7 +34,7 @@ (define* (make-icecat-extension pkg #:optional (pkg-output "out")) (native-inputs '()) (inputs '()) (propagated-inputs (package-propagated-inputs pkg)) - (outputs '("out")) + (outputs '("out" "icecat" "torbrowser")) (build-system trivial-build-system) (arguments (list @@ -61,11 +61,21 @@ (define* (make-icecat-extension pkg #:optional (pkg-output "out")) ;; which would change too often. We don't want the add-on path to ;; be hard-coded either because it would never change (but it ;; wouldn't make sense anyway). - (let* ((addon-id #$(assq-ref (package-properties pkg) 'addon-id)) - (moz-app-id "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") - (search-dir (string-append #$output "/lib/icecat/extensions/" - moz-app-id))) - - (mkdir-p search-dir) - (symlink (in-vicinity (ungexp pkg pkg-output) addon-id) - (in-vicinity search-dir addon-id)))))))) + (for-each + (lambda (variant) + (let* ((addon-id #$(assq-ref (package-properties pkg) 'addon-id)) + (moz-app-id "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") + (search-dir + (lambda (out) + (string-append (assoc-ref %outputs out) "/lib/" variant + "/extensions/" moz-app-id))) + (symlink-addon + (lambda (out) + (mkdir-p (search-dir out)) + (symlink (in-vicinity (ungexp pkg pkg-output) addon-id) + (in-vicinity (search-dir out) addon-id))))) + (symlink-addon variant) + ;; Symlink to the main output so that a user can install the + ;; add-on for all of the Firefox variants at once. + (symlink-addon "out"))) + (cdr '#$outputs))))))) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index b81944ee6b96..c46f48a808da 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -563,6 +563,10 @@ (define-public torbrowser #$flags)) ((#:phases phases) #~(modify-phases #$phases + (add-after 'apply-guix-specific-patches 'fix-system-dir + (lambda _ + (substitute* "toolkit/xre/nsXREDirProvider.cpp" + (("ICECAT_SYSTEM_DIR") "TORBROWSER_SYSTEM_DIR")))) (add-before 'configure 'setenv (lambda _ (setenv "CONFIG_SHELL" (which "bash")) @@ -758,7 +762,12 @@ (define-public torbrowser tor-client torbrowser-assets))) (propagated-inputs - (list noscript/icecat)) + (list `(,noscript/icecat "torbrowser"))) + (native-search-paths + (list (search-path-specification + (variable "TORBROWSER_SYSTEM_DIR") + (separator #f) ;single entry + (files '("lib/torbrowser"))))) (home-page "https://www.torproject.org") (synopsis "Anonymous browser derived from Mozilla Firefox") (description