pyrox.dev / nixpkgs
lol
fork atom

r-openssl: fix build

Peter Simons 45833140 86ad1451

+2 -5
unified split
+2 -5
pkgs/development/r-modules/default.nix
··· 279 ncdf4 = [ pkgs.netcdf ]; 280 nloptr = [ pkgs.nlopt ]; 281 odbc = [ pkgs.unixODBC ]; 282 - openssl = [ pkgs.openssl pkgs.openssl.dev ]; 283 outbreaker = [ pkgs.gsl_1 ]; 284 pander = [ pkgs.pandoc pkgs.which ]; 285 pbdMPI = [ pkgs.openmpi ]; ··· 837 }); 838 839 openssl = old.openssl.overrideDerivation (attrs: { 840 - OPENSSL_INCLUDES = "${pkgs.openssl.dev}/include"; 841 - preConfigure = '' 842 - sed -i.bak 's|^\( *PKG_LIBS_VERSIONED=\).*$|\1$PKG_LIBS|' configure 843 - ''; 844 }); 845 846 Rserve = old.Rserve.overrideDerivation (attrs: {
··· 279 ncdf4 = [ pkgs.netcdf ]; 280 nloptr = [ pkgs.nlopt ]; 281 odbc = [ pkgs.unixODBC ]; 282 outbreaker = [ pkgs.gsl_1 ]; 283 pander = [ pkgs.pandoc pkgs.which ]; 284 pbdMPI = [ pkgs.openmpi ]; ··· 836 }); 837 838 openssl = old.openssl.overrideDerivation (attrs: { 839 + PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include"; 840 + PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto"; 841 }); 842 843 Rserve = old.Rserve.overrideDerivation (attrs: {