ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 23:02:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: java-hamcrest-all: Add java-hamcrest-core to inputs.

Browse source 
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.
This commit is contained in:
Ricardo Wurmus 2018-07-02 16:24:26 +02:00
parent 084f64cb03
commit 2cc63e6fcf
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/java.scm
View file

@ -3871,11 +3871,20 @@ (define-public java-hamcrest-all
(find-files (assoc-ref inputs "java-junit") "\\.jar$") (find-files (assoc-ref inputs "java-junit") "\\.jar$")
(find-files (assoc-ref inputs "java-jmock") "\\.jar$") (find-files (assoc-ref inputs "java-jmock") "\\.jar$")
(find-files (assoc-ref inputs "java-easymock") "\\.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))))))) #t)))))))
(inputs (inputs
`(("java-junit" ,java-junit) `(("java-junit" ,java-junit)
("java-jmock" ,java-jmock-1) ("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) ("java-easymock" ,java-easymock)
,@(package-inputs java-hamcrest-core))))) ,@(package-inputs java-hamcrest-core)))))