summaryrefslogtreecommitdiff
path: root/guix/import
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2023-02-17 22:26:41 +0100
committerRicardo Wurmus <rekado@elephly.net>2023-02-18 19:56:30 +0100
commit8525c2649933f6f8e8e55f5f7c7514b3889b3e9b (patch)
treee93e4807d919be8e155be28488630186132cf565 /guix/import
parent049cff91acd3ace275c3f2af97755812af023c6b (diff)
import/cran: Remove directory-needs-zlib? in favor of needed-libraries-in-directory.
* guix/import/cran.scm (directory-needs-zlib?): Remove procedure. (source-dir->dependencies): Use needed-libraries-in-directory instead of directory-needs-zlib?.
Diffstat (limited to 'guix/import')
-rw-r--r--guix/import/cran.scm7
1 files changed, 1 insertions, 6 deletions
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 75caecb620..17c19a2dcf 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -471,11 +471,6 @@ the given REGEXP."
(else (loop))))))))
(apply find-files directory file-patterns))))
-(define (directory-needs-zlib? dir)
- "Return #T if any of the Makevars files in the src directory DIR contain a
-zlib linker flag."
- (files-match-pattern? dir "-lz" "(Makevars.*|configure.*)"))
-
(define packages-for-matches
'(("-lcrypto" . "openssl")
("-lcurl" . "curl")
@@ -530,7 +525,7 @@ the pkg-config tool."
"Guess dependencies of R package source in DIR and return two values: a list
of package names for INPUTS and another list of names of NATIVE-INPUTS."
(values
- (if (directory-needs-zlib? dir) '("zlib") '())
+ (needed-libraries-in-directory dir)
(append
(if (directory-needs-esbuild? dir) '("esbuild") '())
(if (directory-needs-pkg-config? dir) '("pkg-config") '())