[bug#49597] [PATCH core-updates 14/15] gnu: Use 'search-input-file' when looking for .jar files.

[Maxime Devos <maximedevos@telenet.be>]

[-- Attachment #1: Type: text/plain, Size: 1535 bytes --]

> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index fdfd044926..f4a426e559 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -382,8 +382,7 @@ JNI.")
>               (setenv "JAVAC"
>                       (search-input-file inputs "/bin/jikes"))
>               (setenv "CLASSPATH"
> -                     (string-append (assoc-ref inputs "jamvm")
> -                                    "/lib/rt.jar"))
> +                     (search-input-file inputs "/lib/rt.jar"))
>  
>               ;; Ant complains if this file doesn't exist.
>               (setenv "HOME" "/tmp")

This is "ant-bootstrap", right?
"jikes" and "jamvm" are in 'native-inputs',
so 'search-input-file (or native-inputs inputs) [...]' is required
here.

> @@ -486,8 +485,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
>             (lambda* (#:key inputs #:allow-other-keys)
>               (setenv "CLASSPATH"
>                       (string-join
> -                      (cons (string-append (assoc-ref inputs "jamvm")
> -                                           "/lib/rt.jar")
> +                      (cons (search-input-file inputs "/lib/rt.jar")
>                              (find-files (string-append
>                                           (assoc-ref inputs "ant-bootstrap")
>                                           "/lib")

Likewise.

That issue was present in the original code, though,
but something to consider.

Greetings,
Maxime.


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]