blob: 4ebdadc671ce4c0c6d16444f01d793468c5cbeb7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
From d156313340d3edcd78751ea8ed5e66c7668275c3 Mon Sep 17 00:00:00 2001
From: Alexey Abramov <levenson@mmer.org>
Date: Sun, 8 Mar 2020 20:07:22 +0100
Subject: [PATCH] openjfx: Determine the version of Java in JDK_HOME
Icedtea contains guix in its version, so build.gradle failes to run. Openjfx
packaging is not trivial, so you will probably need to try build it with
gradlew.
---
build.gradle | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index df82f63..2c626cd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -742,9 +742,9 @@ try {
if (inStream.readLine() != null) {
String v = inStream.readLine();
if (v != null) {
- int ib = v.indexOf(" (build ");
+ int ib = v.indexOf(" (guix build ");
if (ib != -1) {
- String ver = v.substring(ib + 8, v.size() - 1);
+ String ver = v.substring(ib + 13, v.size() - 1);
defineProperty("jdkRuntimeVersion", ver)
defineProperty("jdkVersion", jdkRuntimeVersion.split("-")[0])
@@ -3540,4 +3540,3 @@ compileTargets { t ->
}
)
}
-
--
2.24.1
|