Merge pull request #46445 from ryantm/rpostgres

rPackages.RPostgres: fix configure paths and includes
This commit is contained in:
Ryan Mulligan 2018-09-09 20:33:14 -07:00 committed by GitHub
commit 8e991ac409
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -906,6 +906,14 @@ let
TCLLIBPATH = "${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}"; TCLLIBPATH = "${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}";
}); });
RPostgres = old.RPostgres.overrideDerivation (attrs: {
preConfigure = ''
export INCLUDE_DIR=${pkgs.postgresql}/include
export LIB_DIR=${pkgs.postgresql.lib}/lib
patchShebangs configure
'';
});
OpenMx = old.OpenMx.overrideDerivation (attrs: { OpenMx = old.OpenMx.overrideDerivation (attrs: {
preConfigure = '' preConfigure = ''
patchShebangs configure patchShebangs configure