summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2023-06-02 12:48:42 +0200
committerRicardo Wurmus <rekado@elephly.net>2023-06-02 12:48:42 +0200
commit67183e25ada01ec8125f5784c27fc3d098f7c0f0 (patch)
treeec6fd43546969d7bfb2358fdb6251caf17810c7f
parentbb27e3b8b13b4dbbb698b3ff5a4f6cf5793e9d5c (diff)
downloadguix-67183e25ada01ec8125f5784c27fc3d098f7c0f0.tar.gz
import/cran: Also search Makevars file for libraries.
* guix/import/cran.scm (needed-libraries-in-directory): Look at Makevars in
addition to Makevars.in for libraries.
-rw-r--r--guix/import/cran.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index d25f334396..bec2010cc5 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -503,7 +503,7 @@ referenced in build system files."
                        packages
                        (list-matches libraries-pattern line))))))))))
     (set)
-    (find-files dir "(Makevars.in*|configure.*)"))))
+    (find-files dir "(Makevars(.in.*)?|configure.*)"))))
 
 (define (directory-needs-pkg-config? dir)
   "Return #T if any of the Makevars files in the src directory DIR reference