From mboxrd@z Thu Jan 1 00:00:00 1970 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 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-Message-ID: Date: Wed, 22 Jan 2020 21:13:13 +0100 Message-Id: <20200122201313.27946-1-me@tobias.gr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" Reply-to: Tobias Geerinckx-Rice , Tobias Geerinckx-Rice via Guix-patches From: Tobias Geerinckx-Rice via Guix-patches via To: 39146@debbugs.gnu.org Cc: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= * 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. -- 2.23.0