From patchwork Thu Nov 9 19:13:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 56155 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 12FBF27BBE9; Thu, 9 Nov 2023 19:14:56 +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 156F027BBE2 for ; Thu, 9 Nov 2023 19:14:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1AUC-00040Q-7Z; Thu, 09 Nov 2023 14:14:40 -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 1r1ATv-0003rE-I5 for guix-patches@gnu.org; Thu, 09 Nov 2023 14:14:28 -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 1r1ATv-0002Ck-5r for guix-patches@gnu.org; Thu, 09 Nov 2023 14:14:23 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r1AUY-0005pC-4b for guix-patches@gnu.org; Thu, 09 Nov 2023 14:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67026] [PATCH 3/3] gnu: josm: Reduce closure size. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 19:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67026 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67026@debbugs.gnu.org Received: via spool by 67026-submit@debbugs.gnu.org id=B67026.169955724522293 (code B ref 67026); Thu, 09 Nov 2023 19:15:02 +0000 Received: (at 67026) by debbugs.gnu.org; 9 Nov 2023 19:14:05 +0000 Received: from localhost ([127.0.0.1]:48756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1ATd-0005nU-AQ for submit@debbugs.gnu.org; Thu, 09 Nov 2023 14:14:05 -0500 Received: from lepiller.eu ([89.234.186.109]:47832 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1ATa-0005mY-3P for 67026@debbugs.gnu.org; Thu, 09 Nov 2023 14:14:02 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 2e28ed03 for <67026@debbugs.gnu.org>; Thu, 9 Nov 2023 19:13:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=+EAmRYDG3vpJGXMJ0Z3vOClCO wWVl6g8LjE/zlir+TY=; b=Hcws3uyhAPkb4ye5c1bBNDdeK6L9eu1If9YNoX7lL X4IBlyoz/sNU7XBaQWTI98tDgAiwoEGWcok6rpEJTUYt7rrTIhaMcrorirdSsUTv ApGDrnGbLkBu7vq2JbhTTD3OZiSjt/LpM0+EJkqO1fF1F9JegTRfo5MCCz0rc2xZ VbEKBtlFN2M9re5K+mlqBEHiNczVh7lZrdCU2LC1jGN+i7itVNiGrPtCKB2OVVl1 DyIQFnqw7tub7k6vmhNA7EBjOrS77FlyOueWLmWvQWqLTMY+WPPVyTyBJyJTDFt0 yNG6r6xANmSiTSaFRg7ai/4WVMbpPxtsDFGFQznWK0wRg== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 713882dc (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <67026@debbugs.gnu.org>; Thu, 9 Nov 2023 19:13:16 +0000 (UTC) From: Julien Lepiller Date: Thu, 9 Nov 2023 20:13:09 +0100 Message-ID: <20231109191309.6876-3-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231109191309.6876-1-julien@lepiller.eu> References: <20231109191309.6876-1-julien@lepiller.eu> 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 This saves 240MB of closure size. * gnu/packages/geo.scm (josm)[inputs]: Add openjdk11. [arguments]: Filter native inputs out of CLASSPATH. Use `java' from openjdk11 instead of the JDK. Change-Id: Ifa03b5cd033c5866d22e7557119284be0ea25a0e --- gnu/packages/geo.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index dbc8440141..746b22a082 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1970,7 +1970,8 @@ (define-public josm java-openjfx-media java-parsson ; runtime dependency java-signpost-core - java-svg-salamander)) + java-svg-salamander + openjdk11)) (arguments `(#:tests? #f #:jar-name "josm.jar" @@ -2070,9 +2071,16 @@ (define-public josm (lambda _ (display (string-append "#!/bin/sh\n" - (assoc-ref inputs "jdk") "/bin/java" + (assoc-ref inputs "openjdk") "/bin/java" " -cp " out "/share/java/josm.jar:" - (getenv "CLASSPATH") + ;; CLASSPATH, but remove native inputs + (string-join + (filter + (lambda (jar) + (and (not (string-contains jar "-jdk/")) + (not (string-contains jar "-javacc-")))) + (string-split (getenv "CLASSPATH") #\:)) + ":") " org.openstreetmap.josm.gui.MainApplication")))) (chmod (string-append bin "/josm") #o755)) #t)))))