R: remove qtbase.patch and fix few CRAN packages
This commit is contained in:
@@ -279,6 +279,7 @@ let
|
||||
mwaved = [ pkgs.fftw.dev ];
|
||||
ncdf4 = [ pkgs.netcdf ];
|
||||
nloptr = [ pkgs.nlopt pkgs.pkgconfig ];
|
||||
n1qn1 = [ pkgs.gfortran ];
|
||||
odbc = [ pkgs.unixODBC ];
|
||||
pander = [ pkgs.pandoc pkgs.which ];
|
||||
pbdMPI = [ pkgs.openmpi ];
|
||||
@@ -412,6 +413,11 @@ let
|
||||
systemfonts = [ pkgs.pkgconfig ];
|
||||
tesseract = [ pkgs.pkgconfig ];
|
||||
Cairo = [ pkgs.pkgconfig ];
|
||||
CLVTools = [ pkgs.gsl ];
|
||||
JMcmprsk = [ pkgs.gsl ];
|
||||
mashr = [ pkgs.gsl ];
|
||||
hadron = [ pkgs.gsl ];
|
||||
AMOUNTAIN = [ pkgs.gsl ];
|
||||
Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ];
|
||||
tcltk2 = [ pkgs.tcl pkgs.tk ];
|
||||
tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ];
|
||||
@@ -799,7 +805,7 @@ let
|
||||
openssl = old.openssl.overrideDerivation (attrs: {
|
||||
preConfigure = ''
|
||||
patchShebangs configure
|
||||
'';
|
||||
'';
|
||||
PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include";
|
||||
PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto";
|
||||
});
|
||||
@@ -854,6 +860,12 @@ let
|
||||
'';
|
||||
});
|
||||
|
||||
libgeos = old.libgeos.overrideDerivation (attrs: {
|
||||
preConfigure = ''
|
||||
patchShebangs configure
|
||||
'';
|
||||
});
|
||||
|
||||
protolite = old.protolite.overrideDerivation (attrs: {
|
||||
preConfigure = ''
|
||||
patchShebangs configure
|
||||
|
||||
Reference in New Issue
Block a user