From fff4fcc4e22f11788dfaf103141ff6cffbf788dc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 16 May 2020 17:04:35 +0200 Subject: gnu: java-junit: Install from pom file. * gnu/packages/java.scm (java-junit)[arguments]: Replace install phase. (java-hamcrest-core)[arguments]: Replace install phase. (java-hamcrest-library)[arguments]: Replace install phase. (java-cisd-jhdf5, java-commons-math3, java-commons-collections4) (java-commons-io, java-commons-exec-1.1, java-commons-exec) (java-commons-lang3, java-commons-codec, java-native-access) (java-native-access-platform, java-hamcrest-all): Change junit and hamcrest jar location accordingly. (java-hamcrest-all): Use old install phase of java-hamcrest-core. * gnu/packages/maths.scm (java-hdf): Change junit and hamcrest jar location accordingly. --- gnu/packages/maths.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b75fd25a23..ee4d30cfbe 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1187,10 +1187,15 @@ (define-public hdf-java (jhdf (string-append lib "/jhdf.jar")) (jhdf5 (string-append lib "/jhdf5.jar")) (testjars - (map (lambda (i) - (string-append (assoc-ref inputs i) - "/share/java/" i ".jar")) - '("junit" "hamcrest-core" "slf4j-api" "slf4j-simple"))) + (append + (map (lambda (i) + (string-append (assoc-ref inputs i) + "/share/java/" i ".jar")) + '("slf4j-api" "slf4j-simple")) + (list + (car (find-files (assoc-ref inputs "junit") "jar$")) + (car (find-files (assoc-ref inputs "hamcrest-core") + "jar$"))))) (class-path (string-join `("." ,build-dir ,jhdf ,jhdf5 ,@testjars) ":"))) -- cgit v1.2.3