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 ss='sub right'>
aboutsummaryrefslogtreecommitdiff
path: root/gnu/installer/proxy.scm
AgeCommit message (Expand)Author
2020-12-11install: Discover local substitute servers....* gnu/installer/substitutes.scm: New file. * gnu/installer/newt/substitutes.scm: New file. * gnu/local.mk (INSTALLER_MODULES): Add them. * po/guix/POTFILES.in: Add gnu/installer/newt/substitutes.scm. * gnu/installer/proxy.scm (with-silent-shepherd): Move to ... * gnu/installer/utils.scm: ... here. * gnu/installer/record.scm (<installer>)[substitutes-page]: New field. * gnu/installer/newt.scm (substitutes-page): New procedure, (newt-installer): register it. * gnu/installer.scm (installer-steps): Add "substitutes-page" step. * gnu/system/install.scm (%installation-services): Add avahi-service-type and enable substitute server discover in guix-service-type. [<name-service-switch>]: Set it to %mdns-host-lookup-nss. Mathieu Othacehe
2020-04-08installer: Add proxy support....* gnu/installer/proxy.scm: New file. * gnu/local.mk (INSTALLER_MODULES): Add it. * po/guix/POTFILES.in: Add it. * gnu/installer/newt/parameters.scm (run-proxy-page): New procedure, (run-parameters-page): add the previous procedure to the parameters menu. Mathieu Othacehe