guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

23/50: gnu: ant-bootstrap: Bind OUTPUTS in build phase.


From: guix-commits
Subject: 23/50: gnu: ant-bootstrap: Bind OUTPUTS in build phase.
Date: Thu, 23 Dec 2021 12:52:35 -0500 (EST)

rekado pushed a commit to branch wip-java-bootstrap-simplify
in repository guix.

commit 0f89095def62c17a3052af875aa7150caaff53a5
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Sat Dec 18 17:25:28 2021 +0100

    gnu: ant-bootstrap: Bind OUTPUTS in build phase.
    
    * gnu/packages/java.scm (ant-bootstrap)[arguments]: Bind OUTPUTS to remove
    reference to global %OUTPUTS.
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 94567ba..0835383 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -359,7 +359,7 @@ JNI.")
              (setenv "JAVAC" (search-input-file inputs "/bin/jikes"))
              (setenv "CLASSPATH" (search-input-file inputs "/lib/rt.jar"))))
          (replace 'build
-           (lambda* (#:key inputs #:allow-other-keys)
+           (lambda* (#:key inputs outputs #:allow-other-keys)
              ;; Ant complains if this file doesn't exist.
              (setenv "HOME" "/tmp")
              (with-output-to-file "/tmp/.ant.properties"
@@ -386,7 +386,7 @@ JNI.")
                (("depends=\"jars,test-jar\"") "depends=\"jars\""))
              (invoke "bash" "bootstrap.sh"
                      (string-append "-Ddist.dir="
-                                    (assoc-ref %outputs "out")))))
+                                    (assoc-ref outputs "out")))))
          (add-after 'build 'strip-jar-timestamps ;based on ant-build-system
            (lambda* (#:key outputs #:allow-other-keys)
              (define (repack-archive jar)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]