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
This commit is contained in:
parent
7ab24d717d
commit
406e46a159
1 changed files with 5 additions and 7 deletions
|
@ -2465,8 +2465,7 @@ (define-public javacc
|
|||
(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 @@ (define-public javacc
|
|||
(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
|
||||
|
|
Loading…
Reference in a new issue