diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-03 07:20:53 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-03 07:20:53 +0100 |
| commit | 4c323c2f8308bba0e3295f3109d159c7b8f72838 (patch) | |
| tree | 7064e51dfec301c660cc97d83ffa041e011baadd /gnu/packages/java.scm | |
| parent | 260b054aeaa0739bed1637742b6094c97dab47f2 (diff) | |
| parent | 06ebc45e15f2a1bd4526a5a716eed657c902a0c1 (diff) | |
Merge branch 'master' into HEAD
Change-Id: I3f5d121162d98ef2ae61a62c4da3b0fd19d864e8
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7c8c4e0a36..d73550c042 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2311,7 +2311,9 @@ distribution."))) (string-append target new-name)))) (find-files "netbeans" "\\.so$")))))))) (propagated-inputs - (list java-openjfx-base java-swt)) + (list java-openjfx-base)) + (inputs + (list java-swt)) ;; XXX: for unknown reasons ;; modules/graphics/src/main/native-prism-sw/JNativeSurface.c is missing ;; in this revision. @@ -2465,8 +2467,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 +2488,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 |