diff options
| author | Nguyễn Gia Phong <cnx@loang.net> | 2026-02-13 18:04:49 +0900 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2026-02-16 19:23:23 +0100 |
| commit | 2cd64e3de11e07188d895ca91e1bbf5a560786f0 (patch) | |
| tree | 5702cee9d934e7287fbb4b0b7eee25fdb449f4d1 /gnu/packages | |
| parent | 4b5932da6d0bf3f8987643f8c1271d1816cba698 (diff) | |
gnu: antlr4: Specify JRE in executable.
* gnu/packages/java.scm (antlr4)[arguments]<#:phases>{bin-install}:
Specify the path to a java binary. [inputs]: Add openjdk.
(java-tunnelvisionlabs-antlr4-bootstrap)[inputs]: Add openjdk.
* gnu/packages/fontutils.scm (python-afdko)[native-inputs]:
Remove openjdk.
Change-Id: Id3306fed1b10a78b1e3da721b539fb1afac01f13
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/fontutils.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/java.scm | 49 |
2 files changed, 28 insertions, 22 deletions
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 42365ec01cc..4f0febbb0e4 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -294,7 +294,6 @@ them as it goes.") commands))))))) (native-inputs (list antlr4 - openjdk ;required by antlr4 ninja pkg-config python-pytest diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index bc1d1cdd6aa..31995e3d2d5 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9013,28 +9013,33 @@ Python generated sources by ANTLR."))) #t)) (add-after 'install 'bin-install (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((jar (string-append (assoc-ref outputs "out") "/share/java")) - (bin (string-append (assoc-ref outputs "out") "/bin"))) + (let* ((output (assoc-ref outputs "out")) + (bin (string-append output "/bin")) + (bin/antlr4 (string-append bin "/antlr4"))) (mkdir-p bin) - (with-output-to-file (string-append bin "/antlr4") + (with-output-to-file bin/antlr4 (lambda _ (display - (string-append "#!" (which "sh") "\n" - "java -cp " jar "/antlr4.jar:" - (string-join - (apply - append - (map - (lambda (input) - (find-files (assoc-ref inputs input) - ".*\\.jar")) - '("antlr3" "java-stringtemplate" - "java-antlr4-runtime" "java-treelayout" - "java-jsonp-api" "java-icu4j"))) - ":") - " org.antlr.v4.Tool $*")))) - (chmod (string-append bin "/antlr4") #o755) - #t))) + (string-append + "#!" + (search-input-file inputs "bin/sh") + "\n" + (string-append (assoc-ref inputs "openjdk") + "/bin/java") + " -cp " + (string-append output "/share/java/antlr4.jar") + ":" + (string-join + (apply append + (map (lambda (input) + (find-files (assoc-ref inputs input) + "\\.jar$")) + '("antlr3" "java-stringtemplate" + "java-antlr4-runtime" "java-treelayout" + "java-jsonp-api" "java-icu4j"))) + ":") + " org.antlr.v4.Tool $*\n")))) + (chmod bin/antlr4 #o755)))) (add-before 'build 'copy-resources (lambda _ (copy-recursively "tool/resources/" "build/classes") @@ -9079,7 +9084,8 @@ Python generated sources by ANTLR."))) java-icu4j java-jsonp-api java-stringtemplate - java-treelayout)) + java-treelayout + openjdk)) (native-inputs (list java-junit)) (synopsis "Parser and lexer generator in Java") @@ -9249,7 +9255,8 @@ the runtime library of ANTLR."))) ("java-icu4j" ,java-icu4j) ("java-jsonp-api" ,java-jsonp-api) ("java-stringtemplate" ,java-stringtemplate) - ("java-treelayout" ,java-treelayout))))) + ("java-treelayout" ,java-treelayout) + ("openjdk" ,openjdk))))) (define-public java-tunnelvisionlabs-antlr4-runtime (package |