ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-26 04:29:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: r-minimal: Do not compress serialized files.

Browse source 
* gnu/packages/statistics.scm (r-minimal)[arguments]: Replace build phase
"patch-which" with "do-not-compress-serialized-files".
[propagated-inputs]: Move "which" from here...
[inputs]: ...to here.

Fixes <https://bugs.gnu.org/28157>.
This commit is contained in:
Ricardo Wurmus 2017-08-22 12:59:48 +02:00
parent 6be54a8751
commit bd3a184613
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/statistics.scm
View file

@ -126,11 +126,12 @@ (define-public r-minimal
"PKG_BUILT_STAMP=1970-01-01") "PKG_BUILT_STAMP=1970-01-01")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; FIXME: see bug #28157. (add-before 'configure 'do-not-compress-serialized-files
(add-before 'configure 'patch-which
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/library/base/R/unix/system.unix.R" ;; This ensures that Guix can detect embedded store references;
(("@WHICH@") "which")) ;; see bug #28157 for details.
(substitute* "src/library/base/makebasedb.R"
(("compress = TRUE") "compress = FALSE"))
#t)) #t))
(add-before 'configure 'patch-uname (add-before 'configure 'patch-uname
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -250,10 +251,8 @@ (define-public r-minimal
("libxt" ,libxt) ("libxt" ,libxt)
("pcre" ,pcre) ("pcre" ,pcre)
("readline" ,readline) ("readline" ,readline)
("which" ,which)
("zlib" ,zlib))) ("zlib" ,zlib)))
;; FIXME: By default Sys.which embeds a reference to "which", but this
;; reference is not detected by Guix (see bug #28157).
(propagated-inputs `(("which" ,which)))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "R_LIBS_SITE") (variable "R_LIBS_SITE")