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

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit f05d22847275f1d226a42dc044e31ba73e0a68c4
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Mon Jan 9 00:44:26 2023 +0100

    gnu: ant-apache-bcel: Fix inheritance by using gexp.
    
    * gnu/packages/java.scm (ant-apache-bcel)[arguments]: Use gexp; also remove
    trailing #T from build phases.
---
 gnu/packages/java.scm | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index c81b889431..0124491fa6 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1713,27 +1713,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-bcel
-             (lambda* (#:key inputs #:allow-other-keys)
-               (for-each (lambda (file)
-                           (symlink file
-                                    (string-append "lib/optional/"
-                                                   (basename file))))
-                         (find-files (assoc-ref inputs "java-commons-bcel")
-                                     "\\.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-apache-bcel.jar") 
share)
-                 (delete-file-recursively bin)
-                 (delete-file-recursively lib)
-                 #t)))))))
+        #~(modify-phases #$phases
+            (add-after 'unpack 'link-bcel
+              (lambda* (#:key inputs #:allow-other-keys)
+                (for-each (lambda (file)
+                            (symlink file
+                                     (string-append "lib/optional/"
+                                                    (basename file))))
+                          (find-files (assoc-ref inputs "java-commons-bcel")
+                                      "\\.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-apache-bcel.jar") 
share)
+                  (delete-file-recursively bin)
+                  (delete-file-recursively lib))))))))
     (inputs
      (modify-inputs (package-inputs ant/java8)
        (prepend java-commons-bcel)))))