[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: gnu: josm: Reduce closure size.
From: |
guix-commits |
Subject: |
03/03: gnu: josm: Reduce closure size. |
Date: |
Sat, 2 Dec 2023 13:09:24 -0500 (EST) |
roptat pushed a commit to branch master
in repository guix.
commit 06ebc45e15f2a1bd4526a5a716eed657c902a0c1
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Thu Nov 9 19:51:05 2023 +0100
gnu: josm: Reduce closure size.
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 @@ to the OSM opening hours specification.")
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 @@ to the OSM opening hours specification.")
(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)))))