branch master updated: gnu: java-hamcrest-library: Fix race condition.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

roptat pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 7bbe61f  gnu: java-hamcrest-library: Fix race condition.
7bbe61f is described below

commit 7bbe61f8fffb0f21e9a75c7fb8e134d7dbaa9ced
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Sat Jul 18 13:24:12 2020 +0200

    gnu: java-hamcrest-library: Fix race condition.
    
    * gnu/packages/java.scm (java-hamcrest-library)[arguments]: Fix
    build.xml in the same way it is fixed in java-hamcrest-all to prevent a
    race condition.
---
 gnu/packages/java.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d42b537..424c24b 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3796,6 +3796,13 @@ testing frameworks, mocking libraries and UI validation 
rules.")
       ((#:build-target _) "library")
       ((#:phases phases)
        `(modify-phases ,phases
+          (add-after 'unpack 'patch-classpath-for-integration
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "build.xml"
+                (("build/hamcrest-core-\\$\\{version\\}\\.jar")
+                 (car (find-files (assoc-ref inputs "java-hamcrest-core")
+                                  "jar$"))))
+              #t))
           (replace 'create-pom
             (lambda _
              (substitute* "pom/hamcrest-library.pom"