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

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit 1ec13efbd214c0995c73d0a41b63552582fde8ea
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Jul 16 15:49:34 2021 +0200

    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.
---
 gnu/packages/bioinformatics.scm   | 15 +++++++--------
 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 40e4c27..6bc7018 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 367d749..74742df 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 :(