diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-06 21:25:43 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-06 21:25:43 +0200 |
| commit | 7ce1b5e7b74d6409d0bd0bc4272f65edc34fd9df (patch) | |
| tree | 504a250d235a3bc39571e6af1c755077390a371f /gnu/packages/java.scm | |
| parent | f20d1cfb51ed14f325da000406807076323f70bc (diff) | |
| parent | b69ca4d234db8fe2750e9b0d6b6139a5a89a4da6 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b12c3ca95c..43f0f37b91 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2486,10 +2486,10 @@ new Date();")) (source (origin (method hg-fetch) (uri (hg-reference - (url "http://hg.openjdk.java.net/openjfx/8u-dev/rt") - (changeset (string-append - (string-join (string-split version #\.) "u") - "-ga")))) + (url "http://hg.openjdk.java.net/openjfx/8u-dev/rt") + (changeset (string-append + (string-join (string-split version #\.) "u") + "-ga")))) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet @@ -2499,7 +2499,8 @@ new Date();")) #t)) (sha256 (base32 - "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f")))) + "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f")) + (patches (search-patches "java-openjfx-build-jdk_version.patch")))) (build-system ant-build-system) (arguments `(#:jar-name "java-openjfx.jar" |