summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2021-07-26 09:25:20 +0200
committerRicardo Wurmus <rekado@elephly.net>2021-07-28 22:26:19 +0200
commit9ac9bc6051374f4faa3e43fd89b70fc7a73c5bf4 (patch)
tree3f1d4b1e15e0d381c693b5e9e5d40f0216304468 /gnu/packages
parent042b6971d73b6bef8b9e81ac5b9e136ea997edfd (diff)
gnu: r-with-tests: Hardcode path to coreutils’ rm
When running R in a container like this guix environment --no-cwd -C --ad-hoc r-minimal -- Rscript -e 'Sys.timezone()' it would print an additional line sh: rm: command not found before exiting. * gnu/packages/statistics.scm (r-with-tests) [#:phases]: Add substitute* to patch call to `rm` and rename phase to reflect what it does now.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/statistics.scm11
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index ce9f1bf888..7ba7d9f20d 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -213,12 +213,15 @@ This package also provides @command{xls2csv} to export Excel files to CSV.")
(substitute* "src/library/base/makebasedb.R"
(("compress = TRUE") "compress = FALSE"))
#t))
- (add-before 'configure 'patch-uname
+ (add-before 'configure 'patch-coreutils-paths
(lambda* (#:key inputs #:allow-other-keys)
- (let ((uname-bin (string-append (assoc-ref inputs "coreutils")
- "/bin/uname")))
+ (let* ((coreutils (assoc-ref inputs "coreutils"))
+ (uname-bin (string-append coreutils "/bin/uname"))
+ (rm-bin (string-append coreutils "/bin/rm")))
(substitute* "src/scripts/R.sh.in"
- (("uname") uname-bin)))
+ (("uname") uname-bin))
+ (substitute* "src/unix/sys-std.c"
+ (("rm -Rf ") (string-append rm-bin " -Rf "))))
#t))
(add-after 'unpack 'build-reproducibly
(lambda _