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

gnu: Use 'search-input-directory' for the Eigen header directory.

Browse source 
* gnu/packages/bioinformatics.scm (sailfish)[arguments]: Use
'search-input-directory' when searching for Eigen headers.
* gnu/packages/bioinformatics.scm (nanopolish): Likewise.
* gnu/packages/machine-learning.scm (tensorflow): Likewise.
This commit is contained in:
Ludovic Courtès 2021-07-16 15:49:34 +02:00
parent ae112039ac
commit 1ec13efbd2
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/bioinformatics.scm
View file

@ -9499,10 +9499,10 @@ (define-public sailfish
;; Ensure that Eigen headers can be found ;; Ensure that Eigen headers can be found
(setenv "CPLUS_INCLUDE_PATH" (setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "eigen") (string-append (search-input-directory
"/include/eigen3:" inputs "/include/eigen3")
(or (getenv "CPLUS_INCLUDE_PATH") ""))) ":"
#t))))) (or (getenv "CPLUS_INCLUDE_PATH") ""))))))))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("eigen" ,eigen) ("eigen" ,eigen)
@ -12456,10 +12456,9 @@ (define-public nanopolish
(add-after 'unpack 'find-eigen (add-after 'unpack 'find-eigen
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH" (setenv "CPATH"
(string-append (assoc-ref inputs "eigen") (string-append
"/include/eigen3:" (search-input-directory inputs "/include/eigen3")
(or (getenv "CPATH") ""))) ":" (or (getenv "CPATH") "")))))
#t))
(delete 'configure) (delete 'configure)
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)

2
gnu/packages/machine-learning.scm
View file

@ -1732,7 +1732,7 @@ (define-public tensorflow
(string-append (getcwd) "/eigen-src/")) (string-append (getcwd) "/eigen-src/"))
;; Take Eigen headers from our own package. ;; Take Eigen headers from our own package.
(("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/external/eigen_archive") (("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/external/eigen_archive")
(string-append (assoc-ref inputs "eigen") "/include/eigen3"))) (search-input-directory inputs "/include/eigen3")))
;; Correct the RUNPATH of ops libraries generated for Python. ;; Correct the RUNPATH of ops libraries generated for Python.
;; TODO: this doesn't work :( ;; TODO: this doesn't work :(