ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ant-junit: Fix inheritance by using gexp.

Browse source 
* gnu/packages/java.scm (ant-junit)[arguments]: Use gexp; also remove
trailing #T from build phases.
This commit is contained in:
Ricardo Wurmus 2023-01-09 00:45:06 +01:00
parent f05d228472
commit 9e14a7b4d2
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gnu/packages/java.scm
View file

@ -1742,27 +1742,24 @@ (define-public ant-junit
(arguments (arguments
(substitute-keyword-arguments (package-arguments ant/java8) (substitute-keyword-arguments (package-arguments ant/java8)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'link-junit (add-after 'unpack 'link-junit
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(for-each (lambda (file) (for-each (lambda (file)
(symlink file (symlink file
(string-append "lib/optional/" (string-append "lib/optional/"
(basename file)))) (basename file))))
(find-files (assoc-ref inputs "java-junit") (find-files (assoc-ref inputs "java-junit")
"\\.jar$")) "\\.jar$"))))
#t)) (add-after 'build 'install
(add-after 'build 'install (lambda _
(lambda* (#:key outputs #:allow-other-keys) (let ((share (string-append #$output "/share/java"))
(let* ((out (assoc-ref outputs "out")) (bin (string-append #$output "/bin"))
(share (string-append out "/share/java")) (lib (string-append #$output "/lib")))
(bin (string-append out "/bin")) (mkdir-p share)
(lib (string-append out "/lib"))) (install-file (string-append lib "/ant-junit.jar") share)
(mkdir-p share) (delete-file-recursively bin)
(install-file (string-append lib "/ant-junit.jar") share) (delete-file-recursively lib))))))))
(delete-file-recursively bin)
(delete-file-recursively lib)
#t)))))))
(inputs (inputs
(modify-inputs (package-inputs ant/java8) (modify-inputs (package-inputs ant/java8)
(prepend java-junit))))) (prepend java-junit)))))