summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2023-01-04 00:21:09 +0100
committerRicardo Wurmus <rekado@elephly.net>2023-01-04 00:30:56 +0100
commit4a487941ad4f9f3ed30e6616bf8fe68237a76d68 (patch)
tree584e1b25cd0f068d3248f0b19a1368b15d443665 /gnu/packages
parent4fda13bd82c182c4d2c7e57513b0ba2cb3341a98 (diff)
downloadguix-4a487941ad4f9f3ed30e6616bf8fe68237a76d68.tar.gz
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/cran.scm11
1 files changed, 10 insertions, 1 deletions
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