guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/06: gnu: r-qs: Add missing inputs.


From: guix-commits
Subject: 06/06: gnu: r-qs: Add missing inputs.
Date: Tue, 3 Jan 2023 18:32:33 -0500 (EST)

rekado pushed a commit to branch master
in repository guix.

commit 4a487941ad4f9f3ed30e6616bf8fe68237a76d68
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Wed Jan 4 00:21:09 2023 +0100

    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(-)

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]