ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

import/cran: Remove directory-needs-zlib? in favor of needed-libraries-in-directory.

Browse source 
* guix/import/cran.scm (directory-needs-zlib?): Remove procedure.
(source-dir->dependencies): Use needed-libraries-in-directory instead of
directory-needs-zlib?.
This commit is contained in:
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 @@ (define (files-match-pattern? directory regexp . file-patterns)
(else (loop)))))))) (else (loop))))))))
(apply find-files directory file-patterns)))) (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 (define packages-for-matches
'(("-lcrypto" . "openssl") '(("-lcrypto" . "openssl")
("-lcurl" . "curl") ("-lcurl" . "curl")
@ -530,7 +525,7 @@ (define (source-dir->dependencies dir)
"Guess dependencies of R package source in DIR and return two values: a list "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." of package names for INPUTS and another list of names of NATIVE-INPUTS."
(values (values
(if (directory-needs-zlib? dir) '("zlib") '()) (needed-libraries-in-directory dir)
(append (append
(if (directory-needs-esbuild? dir) '("esbuild") '()) (if (directory-needs-esbuild? dir) '("esbuild") '())
(if (directory-needs-pkg-config? dir) '("pkg-config") '()) (if (directory-needs-pkg-config? dir) '("pkg-config") '())