diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-03 07:20:53 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-03 07:20:53 +0100 |
| commit | 4c323c2f8308bba0e3295f3109d159c7b8f72838 (patch) | |
| tree | 7064e51dfec301c660cc97d83ffa041e011baadd /gnu/packages/geo.scm | |
| parent | 260b054aeaa0739bed1637742b6094c97dab47f2 (diff) | |
| parent | 06ebc45e15f2a1bd4526a5a716eed657c902a0c1 (diff) | |
Merge branch 'master' into HEAD
Change-Id: I3f5d121162d98ef2ae61a62c4da3b0fd19d864e8
Diffstat (limited to 'gnu/packages/geo.scm')
| -rw-r--r-- | gnu/packages/geo.scm | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a1992dec26..51c96ccc1a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1969,7 +1969,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" @@ -2069,9 +2070,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))))) |