summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2018-07-02 16:24:26 +0200
committerRicardo Wurmus <rekado@elephly.net>2018-07-02 16:48:03 +0200
commit2cc63e6fcfea85117ab6b39fc3b076cfb64118cd (patch)
tree624526a076b522a343f0e7b24c430ac4eb4e0b89 /gnu
parent084f64cb032b6ab4ce326b088d230bd1ead53ee2 (diff)
gnu: java-hamcrest-all: Add java-hamcrest-core to inputs.
Fixes <https://debbugs.gnu.org/31390>, probably. * gnu/packages/java.scm (java-hamcrest-all)[inputs]: Add java-hamcrest-core. [arguments]: Add java-hamcrest-core to the build-time classpath.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/java.scm11
1 files changed, 10 insertions, 1 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 1b4cc4d3b0..f2f7078459 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3871,11 +3871,20 @@ The jMock library
(find-files (assoc-ref inputs "java-junit") "\\.jar$")
(find-files (assoc-ref inputs "java-jmock") "\\.jar$")
(find-files (assoc-ref inputs "java-easymock") "\\.jar$")))
- ";")))
+ ";"))
+ (("build/hamcrest-core-\\$\\{version\\}\\.jar")
+ (string-append (assoc-ref inputs "java-hamcrest-core")
+ "/share/java/hamcrest-core.jar")))
#t)))))))
(inputs
`(("java-junit" ,java-junit)
("java-jmock" ,java-jmock-1)
+ ;; This is necessary because of what seems to be a race condition.
+ ;; This package would sometimes fail to build because hamcrest-core.jar
+ ;; could not be found, even though it is built as part of this package.
+ ;; Adding java-hamcrest-core appears to fix this problem. See
+ ;; https://debbugs.gnu.org/31390 for more information.
+ ("java-hamcrest-core" ,java-hamcrest-core)
("java-easymock" ,java-easymock)
,@(package-inputs java-hamcrest-core)))))