From ae112039ac8e0562923b9bf6a1e474cdd4513af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 16 Jul 2021 15:47:51 +0200 Subject: [PATCH] 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 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