[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49597] [PATCH core-updates 08/15] gnu: Use 'search-input-directory'
From: |
Ludovic Courtès |
Subject: |
[bug#49597] [PATCH core-updates 08/15] gnu: Use 'search-input-directory' for the Eigen header directory. |
Date: |
Fri, 16 Jul 2021 17:54:13 +0200 |
* 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 adc87ea4dd..6bd56ca085 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 3918d32d2f..3f257df832 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1707,7 +1707,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 :(
--
2.32.0
- [bug#49597] [PATCH core-updates 00/15] Ajust packages to label-less input style, Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 01/15] gnu: commencement: Use gexps and 'local-file' to refer to patches., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 02/15] gnu: tzdata: Remove input labels., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 03/15] gnu: Simplify "Xvbf" invocation in pre-check phases., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 04/15] gnu: Use 'search-input-directory' when looking for tzdata., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 05/15] gnu: Use 'search-input-directory' for the SDL header directory., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 06/15] gnu: Use 'search-input-directory' for the OpenEXR header directory., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 07/15] gnu: Use 'search-input-file' when searching for Automake files., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 08/15] gnu: Use 'search-input-directory' for the Eigen header directory.,
Ludovic Courtès <=
- [bug#49597] [PATCH core-updates 09/15] gnu: Use 'search-input-directory' for glibc locale data., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 10/15] gnu: Use 'search-input-directory' when looking for C/C++ library headers., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 12/15] gnu: Use 'search-input-file' when looking for executables., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 11/15] gnu: Use 'search-input-file' when looking for *.so and *.a., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 15/15] gnu: Use 'search-input-directory' and 'search-input-file' where appropriate., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 14/15] gnu: Use 'search-input-file' when looking for .jar files., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 13/15] gnu: mozjs: Use 'which' where appropriate., Ludovic Courtès, 2021/07/16
- [bug#49597] [PATCH core-updates 00/15] Ajust packages to label-less input style, Mathieu Othacehe, 2021/07/17