[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: r-minimal: Remove extraneous references.
From: |
guix-commits |
Subject: |
01/03: gnu: r-minimal: Remove extraneous references. |
Date: |
Thu, 9 Dec 2021 13:20:04 -0500 (EST) |
rekado pushed a commit to branch master
in repository guix.
commit 4709decb453ac21c4602f78ee692cee37346dea2
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Mon Dec 6 13:21:21 2021 +0100
gnu: r-minimal: Remove extraneous references.
* gnu/packages/statistics.scm (r-minimal)[arguments]: Remove references to
native build-time tools.
---
gnu/packages/statistics.scm | 39 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index cf7a64e..599d6a8 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -403,12 +403,49 @@ available, greatly increasing its breadth and scope.")
(arguments
`(#:tests? #f
,@(substitute-keyword-arguments (package-arguments r-with-tests)
+ ((#:disallowed-references refs '())
+ (cons perl refs))
((#:configure-flags flags)
;; Do not build the recommended packages. The build system creates
;; random temporary directories and embeds their names in some
;; package files. We build these packages with the r-build-system
;; instead.
- `(cons "--without-recommended-packages" ,flags)))))))
+ `(cons "--without-recommended-packages" ,flags))
+ ((#:phases phases '%standard-phases)
+ `(modify-phases ,phases
+ (add-after 'install 'remove-extraneous-references
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* (string-append out "/lib/R/etc/Makeconf")
+ (("^# configure.*")
+ "# Removed to avoid extraneous references\n"))
+ (substitute* (string-append out "/lib/R/bin/libtool")
+ (((string-append
+ "(-L)?("
+ (assoc-ref inputs "bzip2")
+ "|"
+ (assoc-ref inputs "perl")
+ "|"
+ (assoc-ref inputs "texlive")
+ "|"
+ (assoc-ref inputs "texlive-bin")
+ "|"
+ (assoc-ref inputs "texinfo")
+ "|"
+ (assoc-ref inputs "xz")
+ "|"
+ (format #false
+ "/gnu/store/[^-]+-(~{~a~^|~})-[^/]+"
+ '("glibc-utf8-locales"
+ "libselinux"
+ "libsepol"
+ "file"
+ "texlive-bin"
+ "util-macros"
+ "graphite2"))
+ "|"
+ "/gnu/store/[^-]+-glibc-[^-]+-static"
+ ")/lib")) ""))))))))))))
(define-public rmath-standalone
(package (inherit r-minimal)