me/guix
Archived
1
0
Fork 0
Code Activity

gnu: ant-apache-bcel: Fix inheritance by using gexp.

Browse source 
* gnu/packages/java.scm (ant-apache-bcel)[arguments]: Use gexp; also remove
trailing #T from build phases.
This commit is contained in:
Ricardo Wurmus 2023-01-09 00:44:26 +01:00
parent 882baf4b7d
commit f05d228472
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

17
gnu/packages/java.scm
View file

@ -1713,7 +1713,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
(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-bcel (add-after 'unpack 'link-bcel
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(for-each (lambda (file) (for-each (lambda (file)
@ -1721,19 +1721,16 @@ build process and its dependencies, whereas Make uses Makefile format.")
(string-append "lib/optional/" (string-append "lib/optional/"
(basename file)))) (basename file))))
(find-files (assoc-ref inputs "java-commons-bcel") (find-files (assoc-ref inputs "java-commons-bcel")
"\\.jar$")) "\\.jar$"))))
#t))
(add-after 'build 'install (add-after 'build 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let* ((out (assoc-ref outputs "out")) (let ((share (string-append #$output "/share/java"))
(share (string-append out "/share/java")) (bin (string-append #$output "/bin"))
(bin (string-append out "/bin")) (lib (string-append #$output "/lib")))
(lib (string-append out "/lib")))
(mkdir-p share) (mkdir-p share)
(install-file (string-append lib "/ant-apache-bcel.jar") share) (install-file (string-append lib "/ant-apache-bcel.jar") share)
(delete-file-recursively bin) (delete-file-recursively bin)
(delete-file-recursively lib) (delete-file-recursively lib))))))))
#t)))))))
(inputs (inputs
(modify-inputs (package-inputs ant/java8) (modify-inputs (package-inputs ant/java8)
(prepend java-commons-bcel))))) (prepend java-commons-bcel)))))