From patchwork Wed Jan 22 20:13:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 19957 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 C294D17B21; Wed, 22 Jan 2020 20:14:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B984817B0F for ; Wed, 22 Jan 2020 20:14:09 +0000 (GMT) Received: from localhost ([::1]:46500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuMO9-0001aA-9l for patchwork@mira.cbaines.net; Wed, 22 Jan 2020 15:14:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52001) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuMO3-0001ZU-E6 for guix-patches@gnu.org; Wed, 22 Jan 2020 15:14:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuMO2-0005hQ-8Q for guix-patches@gnu.org; Wed, 22 Jan 2020 15:14:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45422) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iuMO1-0005hI-Tn for guix-patches@gnu.org; Wed, 22 Jan 2020 15:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iuMO1-0006rr-P7 for guix-patches@gnu.org; Wed, 22 Jan 2020 15:14:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39146] [PATCH v2] gnu: icecat: Remove about:buildconfig store references. References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> In-Reply-To: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2020 20:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39146@debbugs.gnu.org Cc: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Received: via spool by 39146-submit@debbugs.gnu.org id=B39146.157972401426356 (code B ref 39146); Wed, 22 Jan 2020 20:14:01 +0000 Received: (at 39146) by debbugs.gnu.org; 22 Jan 2020 20:13:34 +0000 Received: from localhost ([127.0.0.1]:51395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuMNW-0006qw-EZ for submit@debbugs.gnu.org; Wed, 22 Jan 2020 15:13:34 -0500 Received: from tobias.gr ([80.241.217.52]:60772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuMNT-0006qj-Gl for 39146@debbugs.gnu.org; Wed, 22 Jan 2020 15:13:28 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id 56170c57; Wed, 22 Jan 2020 20:13:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=2018; i=me@tobias.gr; bh=NAstZ3MqJ Bqtpclwe0gXOa8qXd2+jbv6l6InFy//TLM=; b=Hz3Tj06I11AaB8sGu5m0v+LXS wdtI3u5pEinyOA0vqxfj28JRDFRVLeR739/JD85xMTrAq81onAsFdFVjuA/kDrro QJKCMg/mI/5GtZZqBPl3rQxrqVZZUL/vThhEPZBbKfYCFmK++ZfWTXCT54xlcBm3 TgfYiuEoFhP+g/1HuR2n/afTVxIaDIPgtbgFXI3tIU0gvh/ccOSb1iTvqYei6IZB yi66RQ0rn1a5Zrmk3ZdJ28p+JwDTvTYQlUOvdVrA0HzCAbbYItqAn2cqnIpr6LMw yE5vdRb6KL7DBPLz0q5+DoJSyMzZ/NcGFdjxngxkKtxZRsUc2iPafcsKLVs+A== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 3871112c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 22 Jan 2020 20:13:25 +0000 (UTC) Date: Wed, 22 Jan 2020 21:13:13 +0100 Message-Id: <20200122201313.27946-1-me@tobias.gr> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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: Tobias Geerinckx-Rice , Tobias Geerinckx-Rice via Guix-patches X-Patchwork-Original-From: Tobias Geerinckx-Rice via Guix-patches via From: "ashish.is--- via Guix-patches\" via" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnuzilla.scm (icecat)[arguments]: New ‘neutralise-store-references’ phase. Reported-by: Jakub Kądziołka --- So, Here's a version that correctly calls %store-directory. Tested again, output looks the same. Jakub: I accidentally kept your copyright line in v1, but didn't actually use your code (although part of your comment survives :-). Is the Reported-by above acceptable? Kind regards, T G-R gnu/packages/gnuzilla.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ae0c58eedb..96c3c78e98 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 ng0 -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2020 Oleg Pykhalov @@ -1067,6 +1067,15 @@ from forcing GEXP-PROMISE." (force-output) (retry (- remaining-attempts 1)))) (apply build args))))))) + (add-after 'build 'neutralise-store-references + (lambda _ + ;; Mangle the store references to compilers & other build tools in + ;; about:buildconfig, reducing IceCat's closure by 1 GiB on x86-64. + (substitute* + "dist/bin/chrome/toolkit/content/global/buildconfig.html" + (((format #f "(~a/)([0-9a-z]{32})" (%store-directory)) _ store hash) + (string-append store (string-take hash 8) "…"))) + #t)) (add-before 'configure 'install-desktop-entry (lambda* (#:key outputs #:allow-other-keys) ;; Install the '.desktop' file.