diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-12-31 11:04:51 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-12-31 11:04:51 +0100 |
| commit | ce9383c090fff90acb3a555d0ccfe12d791fef17 (patch) | |
| tree | 7b9cce156799486b94e4f3e55b03831638e73465 /gnu/packages/java.scm | |
| parent | 91be09de61c277d0f1b26cefcefcd0a7fae2e00d (diff) | |
| parent | fc4eb87dc45b169e3912c73bbf60cb8ce76b7c7c (diff) | |
| download | guix-ce9383c090fff90acb3a555d0ccfe12d791fef17.tar.gz | |
Merge remote-tracking branch 'master' into core-updates.
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index cc63ccf19a..c4cbcbdc1b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1,3 +1,4 @@ + ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> @@ -1429,7 +1430,14 @@ bootstrapping purposes.") ("armhf-linux" "/lib/arm") ("aarch64-linux" - "/lib/aarch64"))))) + "/lib/aarch64") + ;; We need a catch-all, dropping + ;; '-linux' works in most cases. + (_ + (string-append + "/lib/" + (string-drop-right + (%current-system) 6))))))) (symlink (string-append lib-path "/server/libjvm.so") (string-append lib-path "/libjvm.so"))) #t)) @@ -11478,7 +11486,7 @@ network protocols, and core version control algorithms.") (define-public abcl (package (name "abcl") - (version "1.5.0") + (version "1.6.0") (source (origin (method url-fetch) @@ -11486,7 +11494,7 @@ network protocols, and core version control algorithms.") version "/abcl-src-" version ".tar.gz")) (sha256 (base32 - "1hhvcg050nfpjbdmskc1cv2j38qi6qfl77a61b5cxx576kbff3lj")) + "0hvbcsffr8n2xwdixc8wyw1bfl9fxn2gyy0c4nma7j9zbn0wwgw9")) (patches (search-patches "abcl-fix-build-xml.patch")))) @@ -11680,7 +11688,9 @@ IPTC, XMP, ICC and more formats.") "1zv3kjdkf6iqf02x6ln76254y634j2ji448y706a65lsbfjmmicf")) (modules '((guix build utils))) (snippet - `(for-each delete-file (find-files "." ".*.jar"))) + '(begin + (for-each delete-file (find-files "." ".*.jar")) + #t)) (patches (search-patches "java-svg-salamander-Fix-non-det.patch")))) (build-system ant-build-system) |