me
/
guix
Archived
1
0
Fork 0
Code

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?.
master
Ricardo Wurmus 2023-02-17 22:26:41 +01:00
parent 049cff91ac
commit 8525c26499
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/import/cran.scm
View File

@ -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") '())