mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
d9ef5aeba7
* gnu/packages/java.scm (java-openjfx-build)[source]: Use it. * gnu/packages/patches/java-openjfx-build-jdk_version.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Alexey Abramov <levenson@mmer.org> Signed-off-by: Ludovic Courtès <ludo@gnu.org>
27 lines
949 B
Diff
27 lines
949 B
Diff
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])
|
|
2.24.1
|