diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2023-12-16 23:14:56 -0500 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2023-12-16 23:14:56 -0500 |
| commit | 17c3a3bfff150a42c904233fa39818d73c9f68f3 (patch) | |
| tree | a7614b7cd9a7106ea59f5ac1caad0c2c496b3a45 /gnu/packages/geo.scm | |
| parent | f5493629e2650c0d30caf0f01f76b2383f78b9de (diff) | |
| parent | fe86819d8bde674766659c22b215d3a689a8026e (diff) | |
Merge branch 'master' into mesa-updates
Change-Id: I0c6e2410c51335c68634738be030e374f5b492e9
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 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))))) |