diff options
| author | Peter Simons <simons@cryp.to> | 2017-10-06 14:01:40 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-11-30 18:45:47 +0100 |
| commit | 458331408e04608efcb4e09fbdfea36839f9aa02 (patch) | |
| tree | c9870491198c217aec8bf9e34606385cdf54ed37 /pkgs | |
| parent | 86ad1451f2704329f04d0e7aa13c49843e36be5c (diff) | |
| download | nixlib-458331408e04608efcb4e09fbdfea36839f9aa02.tar nixlib-458331408e04608efcb4e09fbdfea36839f9aa02.tar.gz nixlib-458331408e04608efcb4e09fbdfea36839f9aa02.tar.bz2 nixlib-458331408e04608efcb4e09fbdfea36839f9aa02.tar.lz nixlib-458331408e04608efcb4e09fbdfea36839f9aa02.tar.xz nixlib-458331408e04608efcb4e09fbdfea36839f9aa02.tar.zst nixlib-458331408e04608efcb4e09fbdfea36839f9aa02.zip | |
r-openssl: fix build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index eaf3731bc4e9..46c21fccf5d8 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: { |