diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-02-25 10:28:03 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-02-25 10:28:03 +0100 |
| commit | 7bf4ce4582cd2f9c5b30c547262c1c4a426c0b9b (patch) | |
| tree | c6f9cc83feaaf685b7542a98e60bc24ea7c297b1 /gnu/packages/java.scm | |
| parent | 06d01c610e3bee61e38a177aecda5982d5b338ae (diff) | |
| parent | 92d8b4c9598ed32cdb6630433d5914c1ae8b7146 (diff) | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a6d55aa358..8be5d98a77 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -92,6 +92,7 @@ #:use-module (gnu packages kerberos) #:use-module (gnu packages security-token) #:use-module (gnu packages xml) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (gnu packages texinfo) #:use-module ((srfi srfi-1) #:select (fold alist-delete)) @@ -1298,10 +1299,10 @@ new Date();")) (catch 'decoding-error (lambda () (substitute* file - (("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)" + (("VERSIONED_JNI_LIB_NAME\\(\"([^\"]*)\", \"([^\"]*)\"\\)" _ name version) (string-append "\"" (find-library name) "\"")) - (("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name) + (("JNI_LIB_NAME\\(\"([^\"]*)\"\\)" _ name) (string-append "\"" (find-library name) "\"")))) (lambda _ ;; Those are safe to skip. @@ -1722,16 +1723,16 @@ OpenJDK.") (package (inherit openjdk17) (name "jbr") - (version "17.0.7-b1020") + (version "17.0.10b1207.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/JetBrains/JetBrainsRuntime.git") - (commit (string-append "jb" version)))) + (commit (string-append "jbr-release-" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0wh9xhqgcjk0jgvpvlvf78dy3r8m0vgqd0f54whpx0qqbmyavgdw")) + "1n9i07i243wrnnnvj05j81qhx3b5dry8y423pnbrrdn8fcwm1f2d")) (patches (search-patches "jbr-17-xcursor-no-dynamic.patch")))) (arguments (substitute-keyword-arguments (package-arguments openjdk17) @@ -1756,20 +1757,21 @@ OpenJDK.") (package (inherit openjdk21) (name "jbr") - (version "21-b240.22") + (version "21.0.2b375.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/JetBrains/JetBrainsRuntime.git") - (commit (string-append "jb" version)))) + (commit (string-append "jbr-release-" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1sx48mm5vap4ab1qr6hy25wlgxljmhvpvrqiqiq692izr8dh7j4c")) + "15rcwbch0xxzcgggc34lna9dwimwqsc0z4mvw5hd428414gz71iy")) (patches (search-patches "openjdk-21-fix-rpath.patch" "jbr-17-xcursor-no-dynamic.patch")))) (inputs `(("wayland" ,wayland) + ("libxkbcommon" ,libxkbcommon) ; for wayland ,@(package-inputs openjdk21))) (arguments (substitute-keyword-arguments (package-arguments openjdk21) |