diff options
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 70 |
1 files changed, 38 insertions, 32 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 6e61bded23..4d3cdef452 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2021 Mike Gerwitz <mtg@gnu.org> ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> -;;; Copyright © 2022, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> +;;; Copyright © 2022, 2024, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2024 Paul A. Patience <paul@apatience.com> ;;; Copyright © 2024 Raven Hallsby <karl@hallsby.com> ;;; Copyright © 2025 Zheng Junjie <873216071@qq.com> @@ -2280,37 +2280,43 @@ Tool for Language Recognition v3).") (native-inputs `(("jdk" ,icedtea "jdk"))) (arguments - `(#:tests? #f ; No tests. - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'install 'fix-wrapper - (lambda* (#:key inputs #:allow-other-keys) - (let ((jps (search-input-file inputs "/bin/jps"))) - (substitute* "bin/drip" - (("jps") jps) - (("brew update && brew upgrade drip") "guix pull && guix install drip") - ;; No need to make: - (("\\(cd -- \"\\$drip_dir\" && make -s\\) \\|\\| exit 1") "") - ;; No need to include source: - (("\\[\\[ -r \\$drip_dir/src/org/flatland/drip/Main\\.java \\]\\]") - "true")) - #t))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (share (string-append out "/share/drip"))) - (mkdir-p bin) - (for-each - (lambda (file) - (install-file (string-append "bin/" file) bin)) - '("drip" "drip_daemon" "drip_proxy")) - (install-file "drip.jar" share) - (substitute* (string-append bin "/drip") - (("drip_dir=\\$bin_dir/..") - (string-append "drip_dir=" share))) - #t)))))) + (list #:tests? #f ; No tests. + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'relax-gcc-14-strictness + (lambda _ + (substitute* "Makefile" + ((" gcc(.*)$" all options) + (string-append + " gcc" + " -Wno-error=incompatible-pointer-types" + " -Wno-error=implicit-function-declaration" + options))))) + (add-before 'install 'fix-wrapper + (lambda* (#:key inputs #:allow-other-keys) + (let ((jps (search-input-file inputs "/bin/jps"))) + (substitute* "bin/drip" + (("jps") jps) + (("brew update && brew upgrade drip") "guix pull && guix install drip") + ;; No need to make: + (("\\(cd -- \"\\$drip_dir\" && make -s\\) \\|\\| exit 1") "") + ;; No need to include source: + (("\\[\\[ -r \\$drip_dir/src/org/flatland/drip/Main\\.java \\]\\]") + "true"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((bin (string-append #$output "/bin")) + (share (string-append #$output "/share/drip"))) + (mkdir-p bin) + (for-each + (lambda (file) + (install-file (string-append "bin/" file) bin)) + '("drip" "drip_daemon" "drip_proxy")) + (install-file "drip.jar" share) + (substitute* (string-append bin "/drip") + (("drip_dir=\\$bin_dir/..") + (string-append "drip_dir=" share))))))))) (home-page "https://github.com/ninjudd/drip") (synopsis "Faster Java Virtual Machine launching") (description "Drip is a launcher for the Java Virtual Machine that |