summaryrefslogtreecommitdiffstats
path: root/pkgs/development/r-modules/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/r-modules/default.nix')
-rw-r--r--pkgs/development/r-modules/default.nix14
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 362e7b81da4e..746e6eefe53e 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -280,6 +280,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 ];
@@ -415,6 +416,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 ];
@@ -802,7 +808,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";
});
@@ -857,6 +863,12 @@ let
'';
});
+ libgeos = old.libgeos.overrideDerivation (attrs: {
+ preConfigure = ''
+ patchShebangs configure
+ '';
+ });
+
protolite = old.protolite.overrideDerivation (attrs: {
preConfigure = ''
patchShebangs configure