[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49597] [PATCH core-updates 07/15] gnu: Use 'search-input-file' when
From: |
Ludovic Courtès |
Subject: |
[bug#49597] [PATCH core-updates 07/15] gnu: Use 'search-input-file' when searching for Automake files. |
Date: |
Fri, 16 Jul 2021 17:54:12 +0200 |
* gnu/packages/audio.scm (libsbsms)[arguments]: Use 'search-input-file'
when searching for Automake file.
* gnu/packages/maths.scm (hdf-java): Likewise.
---
gnu/packages/audio.scm | 6 ++++--
gnu/packages/maths.scm | 10 ++++++----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 09330c3bd3..203965f4c6 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3350,8 +3350,10 @@ analysis plugins or audio feature extraction plugins.")
;; Originally a symlink to '/usr/local/share/automake-1.12/ar-lib'.
(delete-file "ar-lib")
(symlink
- (string-append (assoc-ref inputs "automake") "/share/automake-"
- ,(package-version automake) "/ar-lib")
+ (search-input-file inputs
+ (string-append "/share/automake-"
+ ,(package-version automake)
+ "/ar-lib"))
"ar-lib")
#t)))))
(home-page "http://sbsms.sourceforge.net/")
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 3b41d1bfd7..1ddeb93002 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1354,10 +1354,12 @@ extremely large and complex data collections.")
(with-directory-excursion "config"
(for-each (lambda (file)
(install-file
- (string-append (assoc-ref inputs "automake")
- "/share/automake-"
- ,(version-major+minor
(package-version automake))
- "/" file) "."))
+ (search-input-file inputs
+ (string-append
+ "/share/automake-"
+ ,(version-major+minor
(package-version automake))
+ "/" file))
+ "."))
'("config.sub" "config.guess")))
;; Fix embedded version number
--
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 <=
- [bug#49597] [PATCH core-updates 08/15] gnu: Use 'search-input-directory' for the Eigen header directory., Ludovic Courtès, 2021/07/16
- [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