branch master updated: gnu: r-rjava: Use OpenJDK 11.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

rekado pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 0647f308b4 gnu: r-rjava: Use OpenJDK 11.
0647f308b4 is described below

commit 0647f308b46b7ba7aa136068712f8d82d69d1a35
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Wed Nov 1 19:32:10 2023 +0100

    gnu: r-rjava: Use OpenJDK 11.
    
    See https://github.com/s-u/rJava/issues/307.
    
    * gnu/packages/cran.scm (r-rjava)[arguments]: Use search-input-file.
    [inputs]: Replace icedtea-8 with openjdk11.
    
    Change-Id: I9e67210f1bfd585fb53845dad55a56a639a5d806
---
 gnu/packages/cran.scm | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 3a43251628..e82b027052 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -23314,29 +23314,24 @@ the corresponding outputs (tables and graphs).")
     (properties `((upstream-name . "rJava")))
     (build-system r-build-system)
     (arguments
-     `(#:modules ((guix build utils)
-                  (guix build r-build-system)
-                  (ice-9 match))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'set-JAVA_HOME
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((jdk (assoc-ref inputs "jdk")))
-               (setenv "JAVA_HOME" jdk)
-               (setenv "JAVA" (which "java"))
-               (setenv "JAR" (which "jar"))
-               (setenv "JAVAC" (which "javac"))
-               (setenv "JAVAH" (which "javah"))
-               (setenv "JAVA_CPPFLAGS"
-                       (string-append "-I" jdk "/include "
-                                      "-I" jdk "/include/linux"))
-               (match (find-files (string-append jdk "/jre/lib/") "libjvm.so")
-                 ((lib) (setenv "JAVA_LIBS" lib))
-                 (_ (error "Could not find libjvm.so"))))
-             #t)))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'set-JAVA_HOME
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((jdk (assoc-ref inputs "jdk")))
+                (setenv "JAVA_HOME" jdk)
+                (setenv "JAVA" (which "java"))
+                (setenv "JAR" (which "jar"))
+                (setenv "JAVAC" (which "javac"))
+                (setenv "JAVAH" (which "javah"))
+                (setenv "JAVA_CPPFLAGS"
+                        (string-append "-I" jdk "/include "
+                                       "-I" jdk "/include/linux"))
+                (setenv "JAVA_LIBS" (search-input-file inputs 
"/lib/libjvm.so"))))))))
     (inputs
      `(("icu4c" ,icu4c)
-       ("jdk" ,icedtea-8 "jdk")
+       ("jdk" ,openjdk11 "jdk")
        ("zlib" ,zlib)))
     (home-page "https://www.rforge.net/rJava/";)
     (synopsis "Low-Level R to Java interface")