guix-commits
[Top][All Lists]
Advanced

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

05/138: gnu: r-openssl: Use openssl instead of libressl.


From: guix-commits
Subject: 05/138: gnu: r-openssl: Use openssl instead of libressl.
Date: Wed, 5 Jan 2022 15:24:38 -0500 (EST)

rekado pushed a commit to branch master
in repository guix.

commit d4e0534c4f0f811f06a48b0bea9966bb93ee08e8
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Wed Jan 5 13:12:33 2022 +0100

    gnu: r-openssl: Use openssl instead of libressl.
    
    * gnu/packages/statistics.scm (r-openssl)[arguments]: Add phase to disable
    versioned linking.
    [inputs]: Replace libressl with openssl.
---
 gnu/packages/statistics.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index d4e6bd6842..e9fd2c1a5e 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus 
<rekado@elephly.net>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus 
<rekado@elephly.net>
 ;;; Copyright © 2015 Vicente Vera Parra <vicentemvp@gmail.com>
 ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner 
<efraim@flashner.co.il>
@@ -2387,8 +2387,17 @@ collation, and NAMESPACE files.")
         (base32
          "0na3yficxg0hjql9pvz96f66yh4g5k2hfwcricb705z7f2pk5f23"))))
     (build-system r-build-system)
+    (arguments
+     (list
+      #:phases
+      '(modify-phases %standard-phases
+         (add-after 'unpack 'do-not-use-versioned-linking
+           (lambda _
+             (substitute* "configure"
+               (("PKG_LIBS=\"\\$\\{PKG_LIBS_VERSIONED\\}\"")
+                "PKG_LIBS=\"${PKG_LIBS}\"")))))))
     (inputs
-     (list libressl))
+     (list openssl))
     (native-inputs
      (list pkg-config r-knitr))
     (propagated-inputs



reply via email to

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