diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2023-01-09 00:45:06 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2023-01-09 00:45:06 +0100 |
| commit | 9e14a7b4d20c98b78789975d0232f8f0524b9d8a (patch) | |
| tree | cfe32fddb818a3ade984c0e20c08c5aa078a5875 /gnu/packages/java.scm | |
| parent | f05d22847275f1d226a42dc044e31ba73e0a68c4 (diff) | |
gnu: ant-junit: Fix inheritance by using gexp.
* gnu/packages/java.scm (ant-junit)[arguments]: Use gexp; also remove
trailing #T from build phases.
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0124491fa6..775840d026 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1742,27 +1742,24 @@ build process and its dependencies, whereas Make uses Makefile format.") (arguments (substitute-keyword-arguments (package-arguments ant/java8) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'link-junit - (lambda* (#:key inputs #:allow-other-keys) - (for-each (lambda (file) - (symlink file - (string-append "lib/optional/" - (basename file)))) - (find-files (assoc-ref inputs "java-junit") - "\\.jar$")) - #t)) - (add-after 'build 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share/java")) - (bin (string-append out "/bin")) - (lib (string-append out "/lib"))) - (mkdir-p share) - (install-file (string-append lib "/ant-junit.jar") share) - (delete-file-recursively bin) - (delete-file-recursively lib) - #t))))))) + #~(modify-phases #$phases + (add-after 'unpack 'link-junit + (lambda* (#:key inputs #:allow-other-keys) + (for-each (lambda (file) + (symlink file + (string-append "lib/optional/" + (basename file)))) + (find-files (assoc-ref inputs "java-junit") + "\\.jar$")))) + (add-after 'build 'install + (lambda _ + (let ((share (string-append #$output "/share/java")) + (bin (string-append #$output "/bin")) + (lib (string-append #$output "/lib"))) + (mkdir-p share) + (install-file (string-append lib "/ant-junit.jar") share) + (delete-file-recursively bin) + (delete-file-recursively lib)))))))) (inputs (modify-inputs (package-inputs ant/java8) (prepend java-junit))))) |