summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2022-08-10 10:08:08 +0200
committerRicardo Wurmus <rekado@elephly.net>2022-08-10 15:44:20 +0200
commit4dcb2f3fb752cf948c904e73dead4dda5c8ea1ed (patch)
tree4bfec306195c09b5b7bd33f985d339722550328e
parentfdae170c37ef642c410f5c8153140d20837d188e (diff)
downloadguix-4dcb2f3fb752cf948c904e73dead4dda5c8ea1ed.tar.gz
gnu: r-s2: Update to 1.1.0.
* gnu/packages/cran.scm (r-s2): Update to 1.1.0.
[arguments]: Add build phase to unbreak linking.
-rw-r--r--gnu/packages/cran.scm15
1 files changed, 13 insertions, 2 deletions
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 3348e87096..8061fbfee6 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -17841,16 +17841,27 @@ high-performance functions are provided here.")
 (define-public r-s2
   (package
     (name "r-s2")
-    (version "1.0.7")
+    (version "1.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "s2" version))
        (sha256
         (base32
-         "0gwydn6wdl675ydkcckrci6ylcx30qn8nfhmrp4qx4r9mv3c2410"))))
+         "05n459rp5b1wk826sq3c5d2z1xwgkpfp8m1jnfshvs4gadlfkap3"))))
     (properties `((upstream-name . "s2")))
     (build-system r-build-system)
+    (arguments
+     (list
+      #:phases
+      `(modify-phases %standard-phases
+         ;; We don't want to convert -lssl to -l:libssl.so.1.1; there is only
+         ;; one libssl.so anyway and the -l:* thing breaks linking.
+         (add-after 'unpack 'undo-library-versioning
+           (lambda _
+             (substitute* "configure"
+               (("PKG_LIBS_VERSIONED=.*")
+                "PKG_LIBS_VERSIONED=\"${PKG_LIBS}\"\n")))))))
     (propagated-inputs
      (list r-rcpp r-wk))
     (inputs