[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: javacc: Do not reference a jdk.
From: |
guix-commits |
Subject: |
01/03: gnu: javacc: Do not reference a jdk. |
Date: |
Sat, 2 Dec 2023 13:09:24 -0500 (EST) |
roptat pushed a commit to branch master
in repository guix.
commit 406e46a15965bcb9e68e7c0bf09f14b9c72c6498
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Thu Nov 9 19:17:30 2023 +0100
gnu: javacc: Do not reference a jdk.
The jdk provides java and javac, while a jre only provides the necessary
java, reducing the closure size by 350MB.
* gnu/packages/java.scm (javacc): Remove #t at end of phases.
[inputs]: Add icedtea-8 as the jre.
[arguments]: Use it instead of the jdk.
Change-Id: Icb218c40915550b7ff1db96a48a3c48fa6ef52b4
---
gnu/packages/java.scm | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7c8c4e0a36..eded386a03 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2465,8 +2465,7 @@ debugging, etc.")
(modules '((guix build utils)))
;; Delete bundled jars.
(snippet '(begin (for-each delete-file-recursively
- '("bootstrap" "lib"))
- #t))))
+ '("bootstrap" "lib"))))))
(arguments
`(#:make-flags ; bootstrap from javacc-4
,#~(list (string-append "-Dbootstrap-jar="
@@ -2487,17 +2486,16 @@ debugging, etc.")
(lambda _
(display
(string-append "#!/bin/sh\n"
- (assoc-ref inputs "jdk") "/bin/java"
+ (assoc-ref inputs "icedtea") "/bin/java"
" -cp " dir "/javacc.jar" " `basename $0`"
" $*"))))
(chmod javacc #o755)
;; symlink to different names to affect the first argument and
;; change the behavior of the jar file.
(symlink javacc (string-append bin "/jjdoc"))
- (symlink javacc (string-append bin "/jjtree"))
- #t))))))
-
+ (symlink javacc (string-append bin "/jjtree"))))))))
(native-inputs
- (list javacc-4))))
+ (list javacc-4))
+ (inputs (list icedtea-8))))
(define-public java-ecj
(package