public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r-openssl: fix build

Browse Source
This commit is contained in:
Peter Simons 2017-10-06 14:01:40 +02:00
parent 86ad1451f2
commit 458331408e
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/r-modules/default.nix
View File

@ -279,7 +279,6 @@ let
ncdf4 = [ pkgs.netcdf ]; ncdf4 = [ pkgs.netcdf ];
nloptr = [ pkgs.nlopt ]; nloptr = [ pkgs.nlopt ];
odbc = [ pkgs.unixODBC ]; odbc = [ pkgs.unixODBC ];
openssl = [ pkgs.openssl pkgs.openssl.dev ];
outbreaker = [ pkgs.gsl_1 ]; outbreaker = [ pkgs.gsl_1 ];
pander = [ pkgs.pandoc pkgs.which ]; pander = [ pkgs.pandoc pkgs.which ];
pbdMPI = [ pkgs.openmpi ]; pbdMPI = [ pkgs.openmpi ];
@ -837,10 +836,8 @@ let
}); });
openssl = old.openssl.overrideDerivation (attrs: { openssl = old.openssl.overrideDerivation (attrs: {
OPENSSL_INCLUDES = "${pkgs.openssl.dev}/include"; PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include";
preConfigure = '' PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto";
sed -i.bak 's|^\( *PKG_LIBS_VERSIONED=\).*$|\1$PKG_LIBS|' configure
'';
}); });
Rserve = old.Rserve.overrideDerivation (attrs: { Rserve = old.Rserve.overrideDerivation (attrs: {