[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: r-with-tests: Hardcode path to coreutils’ rm
From: |
guix-commits |
Subject: |
01/01: gnu: r-with-tests: Hardcode path to coreutils’ rm |
Date: |
Mon, 26 Jul 2021 06:42:52 -0400 (EDT) |
lbraun pushed a commit to branch r-updates
in repository guix.
commit 7bc1c50b870b4fcd573fb8aa2c3267b056473853
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Mon Jul 26 09:25:20 2021 +0200
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.
---
gnu/packages/statistics.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index ce9f1bf..7ba7d9f 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 _