[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: gnu: r-minimal: Add tcl/tk support.
From: |
Ricardo Wurmus |
Subject: |
01/04: gnu: r-minimal: Add tcl/tk support. |
Date: |
Thu, 24 May 2018 04:17:31 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit 3146aab7a8d5529599d755fe42ff37965b3415e6
Author: Ricardo Wurmus <address@hidden>
Date: Thu May 24 09:05:53 2018 +0200
gnu: r-minimal: Add tcl/tk support.
* gnu/packages/statistics.scm (r-minimal)[inputs]: Add tcl and tk.
[arguments]: Add configure flags to enable tcl and tk support.
---
gnu/packages/statistics.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index b9ac3e6..38d253b 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -61,6 +61,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages readline)
#:use-module (gnu packages ssh)
+ #:use-module (gnu packages tcl)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
@@ -216,7 +217,7 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
(add-after 'build 'install-info
(lambda _ (zero? (system* "make" "install-info")))))
#:configure-flags
- '(;; Do not build the recommended packages. The build system creates
+ `(;; 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.
@@ -227,6 +228,13 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\"))
{\
"--with-jpeglib"
"--with-libtiff"
"--with-ICU"
+ "--with-tcltk"
+ ,(string-append "--with-tcl-config="
+ (assoc-ref %build-inputs "tcl")
+ "/lib/tclConfig.sh")
+ ,(string-append "--with-tk-config="
+ (assoc-ref %build-inputs "tk")
+ "/lib/tkConfig.sh")
"--enable-R-shlib"
"--enable-BLAS-shlib"
"--with-system-tre")))
@@ -265,6 +273,8 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
;; This avoids a reference to the ungraftable static bash. R uses the
;; detected shell for the "system" procedure.
("bash" ,bash-minimal)
+ ("tcl" ,tcl)
+ ("tk" ,tk)
("which" ,which)
("zlib" ,zlib)))
(native-search-paths