From 4a487941ad4f9f3ed30e6616bf8fe68237a76d68 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Jan 2023 00:21:09 +0100 Subject: gnu: r-qs: Add missing inputs. Use existing packages for zstd and lz4 instead of compiling bundled sources. * gnu/packages/cran.scm (r-qs)[inputs]: Add zstd:lib and lz4. [arguments]: Patch configure script to accept slightly older zstd. --- gnu/packages/cran.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 994e38cb94..d6621c4edc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -34534,7 +34534,16 @@ package.") "0cx5k0mzn6bm8ff58yrqz3hjidxcawxgqbpijnynvin1m4395i4j")))) (properties `((upstream-name . "qs"))) (build-system r-build-system) - (inputs (list zlib)) + (arguments + (list + #:phases + '(modify-phases %standard-phases + ;; Our zstd is at 1.5.0, but this package bundles 1.5.2. + (add-after 'unpack 'use-older-zstd + (lambda _ + (substitute* "configure" + (("100502") "100500"))))))) + (inputs (list lz4 zlib (list zstd "lib"))) (propagated-inputs (list r-rapiserialize r-rcpp r-stringfish)) (native-inputs -- cgit v1.2.3