From 2075b83b2dbd9896e2e69070e3363f3d43fbe133 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 23 Feb 2021 14:07:14 +0100 Subject: gnu: r-haven: Unvendor readstat. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-haven) [snippet]: Remove bundled readstat. [arguments]: Patch Makevars to use system readstat. [inputs]: Replace zlib with readstat. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index baf8e08f86..1d574b9768 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2309,10 +2309,25 @@ including functions for geolocation and routing.") (uri (cran-uri "haven" version)) (sha256 (base32 - "03cypgqhdkrfbfpl1yx2wb7flczrbak1w654wkicmd5ajwr9zvkf")))) + "03cypgqhdkrfbfpl1yx2wb7flczrbak1w654wkicmd5ajwr9zvkf")) + (modules '((guix build utils))) + (snippet + '(begin + ;; unvendor readstat + (delete-file-recursively "src/readstat") + #t)))) (build-system r-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unbundle-readstat + (lambda _ + ;; Not required, since we’re not building readstat. + (substitute* "src/Makevars" + (("-lz") "-lreadstat")) + #t))))) (inputs - `(("zlib" ,zlib))) + `(("readstat" ,readstat))) (native-inputs `(("r-knitr" ,r-knitr))) (propagated-inputs -- cgit v1.2.3