diff options
author | Ludovic Courtès <ludo@gnu.org> | 2017-04-03 00:13:06 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2017-04-03 00:13:06 +0200 |
commit | 2a0d5de5a9decd785b22dafa69aae5320231f1b7 (patch) | |
tree | 6c532e278025fb46a94f4cb3c3a68063b7011fe1 /gnu/packages/statistics.scm | |
parent | 41f6d18fb6ae7adebe72793c625ad4574991fa6d (diff) | |
parent | 245575eaf33801753ac8290e077c4397b2568540 (diff) | |
download | guix-patches-2a0d5de5a9decd785b22dafa69aae5320231f1b7.tar guix-patches-2a0d5de5a9decd785b22dafa69aae5320231f1b7.tar.gz |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/statistics.scm')
-rw-r--r-- | gnu/packages/statistics.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a05ac114d8..bb8b71e546 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -117,7 +117,8 @@ be output in text, PostScript, PDF or HTML.") "0v7wpj89b0i3ad3fi1wak5c93hywmbxv8sdnixhq8l17782nidss")))) (build-system gnu-build-system) (arguments - `(#:make-flags + `(#:disallowed-references (,tzdata-2017a) + #:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib/R/lib") @@ -225,6 +226,7 @@ be output in text, PostScript, PDF or HTML.") ("pkg-config" ,pkg-config) ("texinfo" ,texinfo) ; for building HTML manuals ("which" ,which) ; for tests/Examples/base-Ex.R + ("tzdata" ,tzdata-2017a) ("xz" ,xz))) (inputs `(;; We need not only cairo here, but pango to ensure that tests for the @@ -232,7 +234,6 @@ be output in text, PostScript, PDF or HTML.") ("pango" ,pango) ("coreutils" ,coreutils) ("curl" ,curl) - ("tzdata" ,tzdata) ("openblas" ,openblas) ("gfortran" ,gfortran) ("icu4c" ,icu4c) |