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 b right'>
aboutsummaryrefslogtreecommitdiff
path: root/gnu/build/locale.scm
AgeCommit message (Expand)Author
2019-06-07gnu: glibc-locales: Install symlinks using the normalized codeset....Fixes <https://bugs.gnu.org/36076>. Reported by Jack Hill <jackhill@jackhill.us> and Giovanni Biscuolo <g@xelera.eu> * gnu/build/locale.scm (locale->name+codeset): New file. * gnu/packages/base.scm (make-glibc-locales): Add #:modules and #:imported-modules. Add a 'symlink-normalized-codesets' phase. Ludovic Courtès
2019-06-07Add (gnu build locale)....* gnu/build/locale.scm: New file. * gnu/local.mk (MODULES_NOT_COMPILED): Add it. * gnu/installer/locale.scm (normalize-codeset): Remove. * gnu/system/locale.scm (localedef-command): Remove. (single-locale-directory): Use (gnu build locale). (glibc-supported-locales)[build]: Likewise, and remove 'read-supported-locales'. Ludovic Courtès