summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/java.scm77
1 files changed, 37 insertions, 40 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index fb7512edd20..4d3cdef4524 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2280,46 +2280,43 @@ Tool for Language Recognition v3).")
2280 (native-inputs 2280 (native-inputs
2281 `(("jdk" ,icedtea "jdk"))) 2281 `(("jdk" ,icedtea "jdk")))
2282 (arguments 2282 (arguments
2283 `(#:tests? #f ; No tests. 2283 (list #:tests? #f ; No tests.
2284 #:phases 2284 #:phases
2285 (modify-phases %standard-phases 2285 #~(modify-phases %standard-phases
2286 (delete 'configure) 2286 (delete 'configure)
2287 (add-before 'build 'relax-gcc-14-strictness 2287 (add-before 'build 'relax-gcc-14-strictness
2288 (lambda _ 2288 (lambda _
2289 (substitute* "Makefile" 2289 (substitute* "Makefile"
2290 ((" gcc(.*)$" all options) 2290 ((" gcc(.*)$" all options)
2291 (string-append 2291 (string-append
2292 " gcc" 2292 " gcc"
2293 " -Wno-error=incompatible-pointer-types" 2293 " -Wno-error=incompatible-pointer-types"
2294 " -Wno-error=implicit-function-declaration" 2294 " -Wno-error=implicit-function-declaration"
2295 options))))) 2295 options)))))
2296 (add-before 'install 'fix-wrapper 2296 (add-before 'install 'fix-wrapper
2297 (lambda* (#:key inputs #:allow-other-keys) 2297 (lambda* (#:key inputs #:allow-other-keys)
2298 (let ((jps (search-input-file inputs "/bin/jps"))) 2298 (let ((jps (search-input-file inputs "/bin/jps")))
2299 (substitute* "bin/drip" 2299 (substitute* "bin/drip"
2300 (("jps") jps) 2300 (("jps") jps)
2301 (("brew update && brew upgrade drip") "guix pull && guix install drip") 2301 (("brew update && brew upgrade drip") "guix pull && guix install drip")
2302 ;; No need to make: 2302 ;; No need to make:
2303 (("\\(cd -- \"\\$drip_dir\" && make -s\\) \\|\\| exit 1") "") 2303 (("\\(cd -- \"\\$drip_dir\" && make -s\\) \\|\\| exit 1") "")
2304 ;; No need to include source: 2304 ;; No need to include source:
2305 (("\\[\\[ -r \\$drip_dir/src/org/flatland/drip/Main\\.java \\]\\]") 2305 (("\\[\\[ -r \\$drip_dir/src/org/flatland/drip/Main\\.java \\]\\]")
2306 "true")) 2306 "true")))))
2307 #t))) 2307 (replace 'install
2308 (replace 'install 2308 (lambda* (#:key outputs #:allow-other-keys)
2309 (lambda* (#:key outputs #:allow-other-keys) 2309 (let* ((bin (string-append #$output "/bin"))
2310 (let* ((out (assoc-ref outputs "out")) 2310 (share (string-append #$output "/share/drip")))
2311 (bin (string-append out "/bin")) 2311 (mkdir-p bin)
2312 (share (string-append out "/share/drip"))) 2312 (for-each
2313 (mkdir-p bin) 2313 (lambda (file)
2314 (for-each 2314 (install-file (string-append "bin/" file) bin))
2315 (lambda (file) 2315 '("drip" "drip_daemon" "drip_proxy"))
2316 (install-file (string-append "bin/" file) bin)) 2316 (install-file "drip.jar" share)
2317 '("drip" "drip_daemon" "drip_proxy")) 2317 (substitute* (string-append bin "/drip")
2318 (install-file "drip.jar" share) 2318 (("drip_dir=\\$bin_dir/..")
2319 (substitute* (string-append bin "/drip") 2319 (string-append "drip_dir=" share)))))))))
2320 (("drip_dir=\\$bin_dir/..")
2321 (string-append "drip_dir=" share)))
2322 #t))))))
2323 (home-page "https://github.com/ninjudd/drip") 2320 (home-page "https://github.com/ninjudd/drip")
2324 (synopsis "Faster Java Virtual Machine launching") 2321 (synopsis "Faster Java Virtual Machine launching")
2325 (description "Drip is a launcher for the Java Virtual Machine that 2322 (description "Drip is a launcher for the Java Virtual Machine that