guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

449/449: gnu: r-minimal: Simplify build phase.


From: guix-commits
Subject: 449/449: gnu: r-minimal: Simplify build phase.
Date: Tue, 22 Nov 2022 15:48:11 -0500 (EST)

rekado pushed a commit to branch wip-bioconductor
in repository guix.

commit d297ed0c979b53f23c73ecf23838b24a29382ccf
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Tue Nov 22 21:44:29 2022 +0100

    gnu: r-minimal: Simplify build phase.
    
    * gnu/packages/statistics.scm (r-minimal)[arguments]: Simplify phase
    "remove-extraneous-references".
---
 gnu/packages/statistics.scm | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index afaad446de..a9342319e9 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -452,26 +452,20 @@ available, greatly increasing its breadth and scope.")
                      (substitute* (string-append out "/lib/R/bin/libtool")
                        (((string-append
                           "(-L)?("
-                          (assoc-ref inputs "bzip2")
-                          "|"
-                          (assoc-ref inputs "perl")
-                          "|"
-                          (assoc-ref inputs "texlive-bin")
-                          "|"
-                          (assoc-ref inputs "texinfo")
-                          "|"
-                          (assoc-ref inputs "xz")
-                          "|"
                           (format #false
                                   "~a/[^-]+-(~{~a~^|~})-[^/]+"
                                   (%store-directory)
-                                  '("glibc-utf8-locales"
+                                  '("bzip2"
+                                    "file"
+                                    "glibc-utf8-locales"
+                                    "graphite2"
                                     "libselinux"
                                     "libsepol"
-                                    "file"
+                                    "perl"
+                                    "texinfo"
                                     "texlive-bin"
                                     "util-macros"
-                                    "graphite2"))
+                                    "xz"))
                           "|"
                           (format #false "~a/[^-]+-glibc-[^-]+-static"
                                   (%store-directory))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]