summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-07-16 15:47:51 +0200
committerLudovic Courtès <ludo@gnu.org>2021-07-24 16:23:22 +0200
commitae112039ac8e0562923b9bf6a1e474cdd4513af5 (patch)
treeb441ad7ae3c981f2ea19e7f3c734f3c29048d7e9
parent00d1ccaf1275df3b90198f3a4a52aaf9a16cac0e (diff)
downloadguix-patches-ae112039ac8e0562923b9bf6a1e474cdd4513af5.tar
guix-patches-ae112039ac8e0562923b9bf6a1e474cdd4513af5.tar.gz
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.
-rw-r--r--gnu/packages/audio.scm6
-rw-r--r--gnu/packages/maths.scm10
2 files changed, 10 insertions, 6 deletions
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index b0058180e4..b740f0ffed 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 1726adedb8..0bfc6ef8c2 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