diff options
Diffstat (limited to 'pkgs/development/r-modules/default.nix')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index c9766a985f6f..428d6c60546e 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -278,11 +278,10 @@ let kza = [ pkgs.fftw.dev ]; libamtrack = [ pkgs.gsl_1 ]; magick = [ pkgs.imagemagick.dev ]; - mixcat = [ pkgs.gsl_1 ]; mvabund = [ pkgs.gsl_1 ]; mwaved = [ pkgs.fftw.dev ]; ncdf4 = [ pkgs.netcdf ]; - nloptr = [ pkgs.nlopt ]; + nloptr = [ pkgs.nlopt pkgs.pkgconfig ]; odbc = [ pkgs.unixODBC ]; outbreaker = [ pkgs.gsl_1 ]; pander = [ pkgs.pandoc pkgs.which ]; @@ -353,7 +352,6 @@ let sf = [ pkgs.gdal pkgs.proj pkgs.geos ]; showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype.dev ]; simplexreg = [ pkgs.gsl_1 ]; - SOD = [ pkgs.opencl-headers ]; spate = [ pkgs.fftw.dev ]; ssanv = [ pkgs.proj ]; stsm = [ pkgs.gsl_1 ]; @@ -602,11 +600,9 @@ let "RcmdrPlugin_coin" "RcmdrPlugin_depthTools" "RcmdrPlugin_DoE" - "RcmdrPlugin_doex" "RcmdrPlugin_EACSPIR" "RcmdrPlugin_EBM" "RcmdrPlugin_EcoVirtual" - "RcmdrPlugin_epack" "RcmdrPlugin_EZR" "RcmdrPlugin_FactoMineR" "RcmdrPlugin_HH" @@ -624,7 +620,6 @@ let "RcmdrPlugin_sampling" "RcmdrPlugin_SCDA" "RcmdrPlugin_SLC" - "RcmdrPlugin_SM" "RcmdrPlugin_sos" "RcmdrPlugin_steepness" "RcmdrPlugin_survival" @@ -641,7 +636,6 @@ let "rich" "rioja" "ripa" - "rite" "RNCEP" "RQDA" "RSDA" @@ -861,10 +855,9 @@ let }); nloptr = old.nloptr.overrideDerivation (attrs: { - configureFlags = [ - "--with-nlopt-cflags=-I${pkgs.nlopt}/include" - "--with-nlopt-libs='-L${pkgs.nlopt}/lib -lnlopt_cxx -lm'" - ]; + # Drop bundled nlopt source code. Probably unnecessary, but I want to be + # sure we're using the system library, not this one. + preConfigure = "rm -r src/nlopt_src"; }); V8 = old.V8.overrideDerivation (attrs: { @@ -948,6 +941,15 @@ let PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include -I${pkgs.cyrus_sasl.dev}/include -I${pkgs.zlib.dev}/include"; PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -L${pkgs.cyrus_sasl.out}/lib -L${pkgs.zlib.out}/lib -lssl -lcrypto -lsasl2 -lz"; }); + + ps = old.ps.overrideDerivation (attrs: { + preConfigure = "patchShebangs configure"; + }); + + rlang = old.rlang.overrideDerivation (attrs: { + preConfigure = "patchShebangs configure"; + }); + }; in self |