From 458331408e04608efcb4e09fbdfea36839f9aa02 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Oct 2017 14:01:40 +0200
Subject: [PATCH] r-openssl: fix build
---
pkgs/development/r-modules/default.nix | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index eaf3731bc4e..46c21fccf5d 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -279,7 +279,6 @@ let
ncdf4 = [ pkgs.netcdf ];
nloptr = [ pkgs.nlopt ];
odbc = [ pkgs.unixODBC ];
- openssl = [ pkgs.openssl pkgs.openssl.dev ];
outbreaker = [ pkgs.gsl_1 ];
pander = [ pkgs.pandoc pkgs.which ];
pbdMPI = [ pkgs.openmpi ];
@@ -837,10 +836,8 @@ let
});
openssl = old.openssl.overrideDerivation (attrs: {
- OPENSSL_INCLUDES = "${pkgs.openssl.dev}/include";
- preConfigure = ''
- sed -i.bak 's|^\( *PKG_LIBS_VERSIONED=\).*$|\1$PKG_LIBS|' configure
- '';
+ PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include";
+ PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto";
});
Rserve = old.Rserve.overrideDerivation (attrs: {