diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-07-16 15:49:34 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-07-24 16:23:22 +0200 |
| commit | 1ec13efbd214c0995c73d0a41b63552582fde8ea (patch) | |
| tree | 81c7285f9ea1c62915030b0c1fcb46b055dc639c | |
| parent | ae112039ac8e0562923b9bf6a1e474cdd4513af5 (diff) | |
| download | guix-patches-1ec13efbd214c0995c73d0a41b63552582fde8ea.tar guix-patches-1ec13efbd214c0995c73d0a41b63552582fde8ea.tar.gz | |
gnu: Use 'search-input-directory' for the Eigen header directory.
* 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.
| -rw-r--r-- | gnu/packages/bioinformatics.scm | 15 | ||||
| -rw-r--r-- | gnu/packages/machine-learning.scm | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 40e4c2762b..6bc7018a05 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9499,10 +9499,10 @@ dependency like SeqAn.") ;; Ensure that Eigen headers can be found (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "eigen") - "/include/eigen3:" - (or (getenv "CPLUS_INCLUDE_PATH") ""))) - #t))))) + (string-append (search-input-directory + inputs "/include/eigen3") + ":" + (or (getenv "CPLUS_INCLUDE_PATH") "")))))))) (inputs `(("boost" ,boost) ("eigen" ,eigen) @@ -12456,10 +12456,9 @@ choosing which reads pass the filter.") (add-after 'unpack 'find-eigen (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "eigen") - "/include/eigen3:" - (or (getenv "CPATH") ""))) - #t)) + (string-append + (search-input-directory inputs "/include/eigen3") + ":" (or (getenv "CPATH") ""))))) (delete 'configure) (replace 'install (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 367d7495ce..74742df442 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1732,7 +1732,7 @@ set(eigen_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/external/eigen_archive " (string-append (getcwd) "/eigen-src/")) ;; Take Eigen headers from our own package. (("\\$\\{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. ;; TODO: this doesn't work :( |