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
 class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=54c3b7bf66fbcb15830ca960bc1cc813fa216901'>refs</a><a class='active' href='/guix/log/nix/libstore/store-api.hh'>log</a><a href='/guix/tree/nix/libstore/store-api.hh?id=54c3b7bf66fbcb15830ca960bc1cc813fa216901'>tree</a><a href='/guix/commit/nix/libstore/store-api.hh?id=54c3b7bf66fbcb15830ca960bc1cc813fa216901'>commit</a><a href='/guix/diff/nix/libstore/store-api.hh?id=54c3b7bf66fbcb15830ca960bc1cc813fa216901'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/libstore/store-api.hh'>
<input type='hidden' name='id' value='54c3b7bf66fbcb15830ca960bc1cc813fa216901'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=54c3b7bf66fbcb15830ca960bc1cc813fa216901'>root</a>/<a href='/guix/log/nix?id=54c3b7bf66fbcb15830ca960bc1cc813fa216901'>nix</a>/<a href='/guix/log/nix/libstore?id=54c3b7bf66fbcb15830ca960bc1cc813fa216901'>libstore</a>/<a href='/guix/log/nix/libstore/store-api.hh?id=54c3b7bf66fbcb15830ca960bc1cc813fa216901'>store-api.hh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/nix/libstore/store-api.hh?id=54c3b7bf66fbcb15830ca960bc1cc813fa216901&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-03-30 23:42:07 +0200'>2018-03-30</span></td><td><a href='/guix/commit/nix/libstore/store-api.hh?id=c7589cce8d3f9fcb7769e424f341dba8fb3545d0'>daemon: Remove dead code.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/globals.cc (Settings::loadConfFile, Settings::unpack):
Remove.
* nix/libstore/globals.hh: Adjust accordingly.
* nix/libstore/misc.cc (queryMissing): Remove.
* nix/libstore/misc.hh: Adjust accordingly.
* nix/libstore/store-api.cc (followLinksToStore)
(followLinksToStorePath, computeStorePathForHash): Remove.
* nix/libstore/store-api.hh: Adjust accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-10-28 22:30:17 +0200'>2016-10-28</span></td><td><a href='/guix/commit/nix/libstore/store-api.hh?id=b1fd0ab73425e682a0a1404da6963f47a033bb34'>daemon: Improve the SQLite wrapper API.</a><span class='msg-avail'>...<span class='msg-tooltip'>In particular, this eliminates a bunch of boilerplate code.

Also integrates these Nix commits:

  80da7a6 Probably fix SQLITE_BUSY errors
  37a337b throwSQLiteError(): Check for SIGINT so we don't loop forever

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Eelco Dolstra</td></tr>
<tr><td><span title='2015-12-13 19:20:01 +0100'>2015-12-13</span></td><td><a href='/guix/commit/nix/libstore/store-api.hh?id=f3ff1da42479eda7826d1bcb10e3a067e62a2daa'>daemon: Better distinguish build statuses.</a><span class='msg-avail'>...<span class='msg-tooltip'>In Nix itself, the new 'BuildResult' type is returned by the new
'buildDerivation' method, which we don't have and need.

* nix/libstore/build.cc (Goal)[cancel]: Remove.
[timeOut]: New pure virtual method.
(DerivationGoal)[result]: New field.
[cancel]: Remove.
[timedOut, getResult, done]: New methods.
(DerivationGoal::cancel): Remove.
(DerivationGoal::timedOut): New method.
(DerivationGoal::haveDerivation): Call 'done' instead of 'amDone'.
(DerivationGoal::outputsSubstituted): Ditto.
(DerivationGoal::inputsRealised): Ditto.
(DerivationGoal::buildDone): Ditto.
(DerivationGoal::handleChildOutput): Call 'timedOut' instead of
'cancel'.
(DerivationGoal::done): New method.
(SubstitutionGoal)[cancel]: Remove.
[timedOut]: New method.
(SubstitutionGoal::cancel): Remove.
(SubstitutionGoal::timedOut): New method.
(Worker::waitForInput): Use it.
* nix/libstore/store-api.hh (BuildResult): New struct.

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Eelco Dolstra</td></tr>