ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-09 20:59:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: hdf-java: Look for jars in the right place.

Browse source 
* gnu/packages/maths.scm (hdf-java)[arguments]: Look for slf4j .jar
files in the right place rather than share/java.
This commit is contained in:
Ludovic Courtès 2021-10-23 23:19:02 +02:00
parent 2dffe4767c
commit 22e753b9b1
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/maths.scm
View file

@ -1400,7 +1400,10 @@ (define-public hdf-java
"hdf/hdf5lib/exceptions/Makefile.in" "hdf/hdf5lib/exceptions/Makefile.in"
"hdf/hdflib/Makefile.in") "hdf/hdflib/Makefile.in")
(("\\$\\(TOP\\)/lib/slf4j-api-1\\.7\\.5\\.jar") (("\\$\\(TOP\\)/lib/slf4j-api-1\\.7\\.5\\.jar")
(search-input-file inputs "/share/java/slf4j-api.jar"))) ;; 'slf4j-api-X.Y.Z.jar' is installed in a Maven-style
;; directory, so use 'find-files' to find it.
(car (find-files (assoc-ref inputs "slf4j-api")
"^slf4j-api.*\\.jar$"))))
;; Replace outdated config.sub and config.guess: ;; Replace outdated config.sub and config.guess:
(with-directory-excursion "config" (with-directory-excursion "config"
(for-each (lambda (file) (for-each (lambda (file)
@ -1428,8 +1431,9 @@ (define-public hdf-java
(testjars (testjars
(append (append
(map (lambda (i) (map (lambda (i)
(string-append (assoc-ref inputs i) (car (find-files (assoc-ref inputs i)
"/share/java/" i ".jar")) (string-append "^" i
".*\\.jar$"))))
'("slf4j-api" "slf4j-simple")) '("slf4j-api" "slf4j-simple"))
(list (list
(car (find-files (assoc-ref inputs "junit") "jar$")) (car (find-files (assoc-ref inputs "junit") "jar$"))