[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/17: gnu: Use 'search-input-file' when searching for Automake files.
From: |
guix-commits |
Subject: |
07/17: gnu: Use 'search-input-file' when searching for Automake files. |
Date: |
Sat, 24 Jul 2021 10:28:05 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit ae112039ac8e0562923b9bf6a1e474cdd4513af5
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Jul 16 15:47:51 2021 +0200
gnu: Use 'search-input-file' when searching for Automake files.
* 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 b005818..b740f0f 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3360,8 +3360,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 1726ade..0bfc6ef 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1353,10 +1353,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
- 02/17: gnu: tzdata: Remove input labels., (continued)
- 02/17: gnu: tzdata: Remove input labels., guix-commits, 2021/07/24
- 01/17: gnu: commencement: Use gexps and 'local-file' to refer to patches., guix-commits, 2021/07/24
- 08/17: gnu: Use 'search-input-directory' for the Eigen header directory., guix-commits, 2021/07/24
- 03/17: gnu: Simplify "Xvbf" invocation in pre-check phases., guix-commits, 2021/07/24
- 04/17: gnu: Use 'search-input-directory' when looking for tzdata., guix-commits, 2021/07/24
- 05/17: gnu: Use 'search-input-directory' for the SDL header directory., guix-commits, 2021/07/24
- 06/17: gnu: Use 'search-input-directory' for the OpenEXR header directory., guix-commits, 2021/07/24
- 11/17: gnu: Use 'search-input-file' when looking for *.so and *.a., guix-commits, 2021/07/24
- 12/17: gnu: Use 'search-input-file' when looking for executables., guix-commits, 2021/07/24
- 16/17: gnu: glibc: Remove versions 2.27 and 2.28., guix-commits, 2021/07/24
- 07/17: gnu: Use 'search-input-file' when searching for Automake files.,
guix-commits <=
- 09/17: gnu: Use 'search-input-directory' for glibc locale data., guix-commits, 2021/07/24
- 10/17: gnu: Use 'search-input-directory' when looking for C/C++ library headers., guix-commits, 2021/07/24
- 13/17: gnu: mozjs: Use 'which' where appropriate., guix-commits, 2021/07/24
- 14/17: gnu: Use 'search-input-file' when looking for .jar files., guix-commits, 2021/07/24
- 15/17: gnu: Use 'search-input-directory' and 'search-input-file' where appropriate., guix-commits, 2021/07/24
- 17/17: gnu: texlive-bin: Use ‘--with-banner-add’ configure option, guix-commits, 2021/07/24