diff options
| author | Peter Simons <simons@cryp.to> | 2018-11-02 12:41:45 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-11-02 17:50:18 +0100 |
| commit | c9e13806267f7fd3351d52a19cc6db5fa2985ca9 (patch) | |
| tree | 3b1cb158cff5978c39bdd9bfc2480920b0a2f297 | |
| parent | 9f9fc7ae1545306837948cda08a16c10fdbcce2a (diff) | |
| download | nixlib-c9e13806267f7fd3351d52a19cc6db5fa2985ca9.tar nixlib-c9e13806267f7fd3351d52a19cc6db5fa2985ca9.tar.gz nixlib-c9e13806267f7fd3351d52a19cc6db5fa2985ca9.tar.bz2 nixlib-c9e13806267f7fd3351d52a19cc6db5fa2985ca9.tar.lz nixlib-c9e13806267f7fd3351d52a19cc6db5fa2985ca9.tar.xz nixlib-c9e13806267f7fd3351d52a19cc6db5fa2985ca9.tar.zst nixlib-c9e13806267f7fd3351d52a19cc6db5fa2985ca9.zip | |
r-nloptr: fix build by adding pkgconfig
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 56c707c6fa76..f40c0fcb5592 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -281,7 +281,7 @@ let 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 ]; @@ -855,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: { |